diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f1cb87b133d1011146170fea2b22a7a41868abb9..8d17a421f0a0812fb68ae874b965afcb7f8d68e7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,9 @@ stages: - mirror variables: - image_name: ubleipzig/deployer + production_repo: ubleipzig/deployer + staging_repo: services.ub.uni-leipzig.de:11443/bdd_dev/deployer + alpha_repo: services.ub.uni-leipzig.de:11443/bdd_dev/deployer docker_build: stage: build @@ -37,11 +39,11 @@ docker_publish_alpha: services: - docker:dind script: | - test "${DOCKER_AUTH_CONFIG}" == "" && echo "docker-config does not exists, aborting!" && false - mkdir -p ~/.docker && echo "$DOCKER_AUTH_CONFIG" >~/.docker/config.json + test "${DOCKER_ALPHA_AUTH_CONFIG}" == "" && echo "docker-config does not exists, aborting!" && false + mkdir -p ~/.docker && echo "$DOCKER_ALPHA_AUTH_CONFIG" >~/.docker/config.json docker load --input=image.tar.gz - docker tag image ${image_name}:alpha-${CI_COMMIT_REF_NAME} - docker push ${image_name}:alpha-${CI_COMMIT_REF_NAME} + docker tag image ${alpha_repo}:alpha-${CI_COMMIT_REF_SLUG} + docker push ${alpha_repo}:alpha-${CI_COMMIT_REF_SLUG} dependencies: - docker_build tags: @@ -57,11 +59,11 @@ docker_publish_staging: services: - docker:dind script: | - test "${DOCKER_AUTH_CONFIG}" == "" && echo "docker-config does not exists, aborting!" && false - mkdir -p ~/.docker && echo "$DOCKER_AUTH_CONFIG" >~/.docker/config.json + test "${DOCKER_STAGING_AUTH_CONFIG}" == "" && echo "docker-config does not exists, aborting!" && false + mkdir -p ~/.docker && echo "$DOCKER_STAGING_AUTH_CONFIG" >~/.docker/config.json docker load --input=image.tar.gz - docker tag image ${image_name}:staging - docker push ${image_name}:staging + docker tag image ${staging_repo}:staging + docker push ${staging_repo}:staging dependencies: - docker_build tags: @@ -75,8 +77,8 @@ docker_publish_production: services: - docker:dind script: | - test "${DOCKER_AUTH_CONFIG}" == "" && echo "docker-config does not exists, aborting!" && false - mkdir -p ~/.docker && echo "$DOCKER_AUTH_CONFIG" >~/.docker/config.json + test "${DOCKER_LIVE_AUTH_CONFIG}" == "" && echo "docker-config does not exists, aborting!" && false + mkdir -p ~/.docker && echo "$DOCKER_LIVE_AUTH_CONFIG" >~/.docker/config.json docker load --input=image.tar.gz export version=`expr ${CI_COMMIT_TAG} ':' 'release/\(.\+\)'` export major_version=`expr ${version} ':' '\([^.]\+\)'` @@ -84,8 +86,8 @@ docker_publish_production: export patch_version=`expr ${version} ':' '[^.]\+\.[^.]\+\.\(.\+\)'` echo "major version ${major_version}, minor version ${minor_version}, patch version ${patch_version}" for tag in "latest" "${major_version}" "${major_version}.${minor_version}" "${version}";do - docker tag image ${image_name}:${tag} - docker push ${image_name}:${tag} + docker tag image ${production_repo}:${tag} + docker push ${production_repo}:${tag} done dependencies: - docker_build diff --git a/Changelog.md b/Changelog.md index e4cdee8cb531b18f2afcebcfa73bb12ff8a4bb17..59b6a3128981a6fc59d6d291e2c82b0a9090e7eb 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,9 @@ # Changelog +## [1.1.1] - 2018-08-14 +### Added +* `--values` option to specify value overrides from YAML file + ## [1.1.0] - 2018-08-08 ### Added * `undeploy` command @@ -8,3 +12,4 @@ * initial release [1.1.0]: https://git.sc.uni-leipzig.de/ubl/bdd_dev/webmasterei/deployer/compare/release%2F1.0.0...release%2F1.1.0 +[1.1.1]: https://git.sc.uni-leipzig.de/ubl/bdd_dev/webmasterei/deployer/compare/release%2F1.1.0...release%2F1.1.1