Skip to content
Snippets Groups Projects
Commit 02cf74c1 authored by Ulf Seltmann's avatar Ulf Seltmann
Browse files

* updated changelog

* modified ci for internal registry
parent 94cf3442
1 merge request!3Resolve "publish alpha-images to internal registry"
This commit is part of merge request !3. Comments created here will be created in the context of that merge request.
...@@ -6,7 +6,9 @@ stages: ...@@ -6,7 +6,9 @@ stages:
- mirror - mirror
variables: 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: docker_build:
stage: build stage: build
...@@ -37,11 +39,11 @@ docker_publish_alpha: ...@@ -37,11 +39,11 @@ docker_publish_alpha:
services: services:
- docker:dind - docker:dind
script: | script: |
test "${DOCKER_AUTH_CONFIG}" == "" && echo "docker-config does not exists, aborting!" && false test "${DOCKER_ALPHA_AUTH_CONFIG}" == "" && echo "docker-config does not exists, aborting!" && false
mkdir -p ~/.docker && echo "$DOCKER_AUTH_CONFIG" >~/.docker/config.json mkdir -p ~/.docker && echo "$DOCKER_ALPHA_AUTH_CONFIG" >~/.docker/config.json
docker load --input=image.tar.gz docker load --input=image.tar.gz
docker tag image ${image_name}:alpha-${CI_COMMIT_REF_NAME} docker tag image ${alpha_repo}:alpha-${CI_COMMIT_REF_NAME}
docker push ${image_name}:alpha-${CI_COMMIT_REF_NAME} docker push ${alpha_repo}:alpha-${CI_COMMIT_REF_NAME}
dependencies: dependencies:
- docker_build - docker_build
tags: tags:
...@@ -57,11 +59,11 @@ docker_publish_staging: ...@@ -57,11 +59,11 @@ docker_publish_staging:
services: services:
- docker:dind - docker:dind
script: | script: |
test "${DOCKER_AUTH_CONFIG}" == "" && echo "docker-config does not exists, aborting!" && false test "${DOCKER_STAGING_AUTH_CONFIG}" == "" && echo "docker-config does not exists, aborting!" && false
mkdir -p ~/.docker && echo "$DOCKER_AUTH_CONFIG" >~/.docker/config.json mkdir -p ~/.docker && echo "$DOCKER_STAGING_AUTH_CONFIG" >~/.docker/config.json
docker load --input=image.tar.gz docker load --input=image.tar.gz
docker tag image ${image_name}:staging docker tag image ${staging_repo}:staging
docker push ${image_name}:staging docker push ${staging_repo}:staging
dependencies: dependencies:
- docker_build - docker_build
tags: tags:
...@@ -75,8 +77,8 @@ docker_publish_production: ...@@ -75,8 +77,8 @@ docker_publish_production:
services: services:
- docker:dind - docker:dind
script: | script: |
test "${DOCKER_AUTH_CONFIG}" == "" && echo "docker-config does not exists, aborting!" && false test "${DOCKER_LIVE_AUTH_CONFIG}" == "" && echo "docker-config does not exists, aborting!" && false
mkdir -p ~/.docker && echo "$DOCKER_AUTH_CONFIG" >~/.docker/config.json mkdir -p ~/.docker && echo "$DOCKER_LIVE_AUTH_CONFIG" >~/.docker/config.json
docker load --input=image.tar.gz docker load --input=image.tar.gz
export version=`expr ${CI_COMMIT_TAG} ':' 'release/\(.\+\)'` export version=`expr ${CI_COMMIT_TAG} ':' 'release/\(.\+\)'`
export major_version=`expr ${version} ':' '\([^.]\+\)'` export major_version=`expr ${version} ':' '\([^.]\+\)'`
...@@ -84,8 +86,8 @@ docker_publish_production: ...@@ -84,8 +86,8 @@ docker_publish_production:
export patch_version=`expr ${version} ':' '[^.]\+\.[^.]\+\.\(.\+\)'` export patch_version=`expr ${version} ':' '[^.]\+\.[^.]\+\.\(.\+\)'`
echo "major version ${major_version}, minor version ${minor_version}, patch version ${patch_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 for tag in "latest" "${major_version}" "${major_version}.${minor_version}" "${version}";do
docker tag image ${image_name}:${tag} docker tag image ${production_repo}:${tag}
docker push ${image_name}:${tag} docker push ${production_repo}:${tag}
done done
dependencies: dependencies:
- docker_build - docker_build
......
# Changelog # Changelog
## [1.1.1] - 2018-08-14
### Added
* `--values` option to specify value overrides from YAML file
## [1.1.0] - 2018-08-08 ## [1.1.0] - 2018-08-08
### Added ### Added
* `undeploy` command * `undeploy` command
...@@ -8,3 +12,4 @@ ...@@ -8,3 +12,4 @@
* initial release * 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.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
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment