Skip to content
Snippets Groups Projects
Commit 7a226757 authored by Sandro Lutz's avatar Sandro Lutz
Browse files

Update network configuration

parent 95a2c16c
No related branches found
No related tags found
No related merge requests found
...@@ -2,6 +2,20 @@ stages: ...@@ -2,6 +2,20 @@ stages:
- build - build
- deploy - deploy
build_master_dev:
stage: build
image: docker:latest
services:
- docker:dind
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script:
- export BUILD_CONFIG_POSTFIX="dev"
- docker build --pull -t "$CI_REGISTRY_IMAGE:dev" ./
- docker push "$CI_REGISTRY_IMAGE:dev"
only:
- master
build_master_prod: build_master_prod:
stage: build stage: build
image: docker:latest image: docker:latest
...@@ -27,10 +41,28 @@ build: ...@@ -27,10 +41,28 @@ build:
except: except:
- master - master
deploy: deploy_prod:
stage: deploy
image: amiveth/service-update-helper
script:
- /update.py
only:
- master
deploy_dev:
stage: deploy
image: amiveth/service-update-helper
script:
- export CI_DEPLOY_SERVICE="$CI_DEPLOY_SERVICE_DEV"
- /update.py
only:
- master
deploy_prod:
stage: deploy stage: deploy
image: amiveth/service-update-helper image: amiveth/service-update-helper
script: script:
- export CI_DEPLOY_SERVICE="$CI_DEPLOY_SERVICE_PROD"
- /update.py - /update.py
only: only:
- master - master
{
"apiUrl": "https://api-dev.amiv.ethz.ch",
"ownUrl": "https://admin-dev.amiv.ethz.ch",
"oAuthID": "Admintools (dev)"
}
{ {
"apiUrl": "https://api-dev.amiv.ethz.ch", "apiUrl": "https://api.amiv.ethz.ch",
"ownUrl": "https://amiv-admin.amiv.ethz.ch", "ownUrl": "https://admin.amiv.ethz.ch",
"oAuthID": "Admintools Beta" "oAuthID": "Admintools"
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment