Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
query
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
proxies
query
Commits
2accbefb
Commit
2accbefb
authored
5 years ago
by
FORESTIER Fabien
Browse files
Options
Downloads
Patches
Plain Diff
Use the new docker registry 'registry.forge.grandlyon.com' and set package.json version to 1.0.1
parent
3d7c6dfc
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!2
v1.0.1
Pipeline
#3567
passed
5 years ago
Stage: build
Stage: deploy
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+3
-2
3 additions, 2 deletions
.gitlab-ci.yml
docker-compose.yml
+1
-1
1 addition, 1 deletion
docker-compose.yml
package.json
+1
-1
1 addition, 1 deletion
package.json
with
5 additions
and
4 deletions
.gitlab-ci.yml
+
3
−
2
View file @
2accbefb
...
@@ -56,8 +56,9 @@ deploy_staging:
...
@@ -56,8 +56,9 @@ deploy_staging:
-
export TECHNICAL_ACCOUNT_PASSWORD=$TECHNICAL_ACCOUNT_PASSWORD
-
export TECHNICAL_ACCOUNT_PASSWORD=$TECHNICAL_ACCOUNT_PASSWORD
-
docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-
docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-
TAG=dev docker-compose pull
-
TAG=dev docker-compose pull
-
docker tag $CI_REGISTRY/refonte-data/proxy-map-services:dev $CI_REGISTRY/refonte-data/proxy-map-services:${TAG}
-
export REGISTRY_PATH=web-et-numerique/web-et-numerique-internet/data.grandlyon.com/web-portal/components/proxies/web-mapping-services
-
docker push $CI_REGISTRY/refonte-data/proxy-map-services:${TAG}
-
docker tag $CI_REGISTRY/$REGISTRY_PATH:dev $CI_REGISTRY/$REGISTRY_PATH:${TAG}
-
docker push $CI_REGISTRY/$REGISTRY_PATH:${TAG}
-
docker-compose --project-name proxy-map-services-${TAG} up -d --force-recreate
-
docker-compose --project-name proxy-map-services-${TAG} up -d --force-recreate
environment
:
environment
:
name
:
staging
name
:
staging
...
...
This diff is collapsed.
Click to expand it.
docker-compose.yml
+
1
−
1
View file @
2accbefb
...
@@ -4,7 +4,7 @@ services:
...
@@ -4,7 +4,7 @@ services:
proxy-mvt
:
proxy-mvt
:
restart
:
unless-stopped
restart
:
unless-stopped
build
:
.
build
:
.
image
:
registry.
alpha
.grandlyon.com/
refonte-data/proxy-map
-services:${TAG}
image
:
registry.
forge
.grandlyon.com/
web-et-numerique/web-et-numerique-internet/data.grandlyon.com/web-portal/components/proxies/web-mapping
-services:${TAG}
ports
:
ports
:
-
${PROXY_MVT_BIND_PORT}:9000
-
${PROXY_MVT_BIND_PORT}:9000
environment
:
environment
:
...
...
This diff is collapsed.
Click to expand it.
package.json
+
1
−
1
View file @
2accbefb
{
{
"name"
:
"proxy-map-services"
,
"name"
:
"proxy-map-services"
,
"version"
:
"1.0.
0
"
,
"version"
:
"1.0.
1
"
,
"description"
:
""
,
"description"
:
""
,
"main"
:
"index.js"
,
"main"
:
"index.js"
,
"scripts"
:
{
"scripts"
:
{
...
...
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