Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
W
web-app
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
web-et-numerique
web-et-numerique-internet
data.grandlyon.com
web-portal
components
custom-apps
web-app
Commits
073968ee
There was a problem fetching the pipeline summary.
Commit
073968ee
authored
7 years ago
by
FORESTIER Fabien
Browse files
Options
Downloads
Patches
Plain Diff
Adding CI conf for development and staging
parent
f62d8b7c
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Pipeline
#
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci.yml
+20
-2
20 additions, 2 deletions
.gitlab-ci.yml
docker-compose-development.yml
+11
-0
11 additions, 0 deletions
docker-compose-development.yml
docker-compose-staging.yml
+1
-1
1 addition, 1 deletion
docker-compose-staging.yml
nginx.conf
+0
-0
0 additions, 0 deletions
nginx.conf
with
32 additions
and
3 deletions
.gitlab-ci.yml
+
20
−
2
View file @
073968ee
...
...
@@ -2,16 +2,34 @@ stages:
-
build
-
deploy
build
:
build_development
:
stage
:
build
only
:
-
master
script
:
-
docker-compose -f docker-compose-development.yml build
deploy_development
:
stage
:
deploy
only
:
-
master
script
:
-
docker-compose -f docker-compose-development.yml up -d
environment
:
name
:
development
build_staging
:
stage
:
build
only
:
-
staging
script
:
-
docker-compose -f docker-compose-staging.yml build
deploy
:
deploy
_staging
:
stage
:
deploy
only
:
-
staging
script
:
-
docker-compose -f docker-compose-staging.yml up -d
environment
:
name
:
staging
This diff is collapsed.
Click to expand it.
docker-compose-development.yml
0 → 100644
+
11
−
0
View file @
073968ee
version
:
"
2"
services
:
nginx-app
:
build
:
context
:
./
volumes
:
-
./nginx.conf:/etc/nginx/conf.d/default.conf
ports
:
-
8081:8080
\ No newline at end of file
This diff is collapsed.
Click to expand it.
docker-compose-staging.yml
+
1
−
1
View file @
073968ee
...
...
@@ -5,7 +5,7 @@ services:
build
:
context
:
./
volumes
:
-
./
webapp-
nginx.conf:/etc/nginx/conf.d/default.conf
-
./nginx.conf:/etc/nginx/conf.d/default.conf
ports
:
-
8080:8080
\ No newline at end of file
This diff is collapsed.
Click to expand it.
webapp-
nginx.conf
→
nginx.conf
+
0
−
0
View file @
073968ee
File moved
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment