Merge branch 'next' into 'master'
tag and push datestamped images too See merge request sneakdotberlin/dockerized-workstation!2
This commit is contained in:
commit
695106b2aa
|
@ -13,6 +13,8 @@ build-master:
|
||||||
script:
|
script:
|
||||||
- docker build --pull -t "$CI_REGISTRY_IMAGE" .
|
- docker build --pull -t "$CI_REGISTRY_IMAGE" .
|
||||||
- docker push "$CI_REGISTRY_IMAGE"
|
- docker push "$CI_REGISTRY_IMAGE"
|
||||||
|
- docker tag "$CI_REGISTRY_IMAGE" "$CI_REGISTRY_IMAGE:v$(date -u +%Y%m%d)"
|
||||||
|
- docker push "$CI_REGISTRY_IMAGE:v$(date -u +%Y%m%d)"
|
||||||
only:
|
only:
|
||||||
- master
|
- master
|
||||||
|
|
||||||
|
@ -21,6 +23,8 @@ build:
|
||||||
script:
|
script:
|
||||||
- docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
|
- docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
|
||||||
- docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
|
- docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
|
||||||
|
- docker tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-v$(date -u +%Y%m%d)"
|
||||||
|
- docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-v$(date -u +%Y%m%d)"
|
||||||
except:
|
except:
|
||||||
- master
|
- master
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue