See last commit
This commit is contained in:
parent
a4bda63d95
commit
3a8541a8d2
1 changed files with 10 additions and 10 deletions
|
@ -13,11 +13,6 @@ variables:
|
||||||
IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
|
IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
|
||||||
IMAGE_LATEST: $CI_REGISTRY_IMAGE:develop
|
IMAGE_LATEST: $CI_REGISTRY_IMAGE:develop
|
||||||
|
|
||||||
rules:
|
|
||||||
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
|
|
||||||
variables:
|
|
||||||
IMAGE_LATEST: $CI_REGISTRY_IMAGE:latest
|
|
||||||
|
|
||||||
|
|
||||||
.node:
|
.node:
|
||||||
image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/node:latest
|
image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/node:latest
|
||||||
|
@ -25,6 +20,11 @@ rules:
|
||||||
|
|
||||||
.docker:
|
.docker:
|
||||||
image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/docker:20
|
image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/docker:20
|
||||||
|
rules:
|
||||||
|
- if: $CI_COMMIT_TAG
|
||||||
|
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_COMMIT_TAG
|
||||||
|
variables:
|
||||||
|
IMAGE_LATEST: $CI_REGISTRY_IMAGE:latest
|
||||||
|
|
||||||
|
|
||||||
linter:
|
linter:
|
||||||
|
@ -49,8 +49,8 @@ build:
|
||||||
expire_in: 30 mins
|
expire_in: 30 mins
|
||||||
paths:
|
paths:
|
||||||
- docker.tar
|
- docker.tar
|
||||||
only:
|
rules:
|
||||||
- tags
|
- !reference [.docker, rules]
|
||||||
|
|
||||||
|
|
||||||
push:
|
push:
|
||||||
|
@ -66,5 +66,5 @@ push:
|
||||||
- docker tag $IMAGE_TAG $IMAGE_LATEST
|
- docker tag $IMAGE_TAG $IMAGE_LATEST
|
||||||
- docker push $IMAGE_TAG
|
- docker push $IMAGE_TAG
|
||||||
- docker push $IMAGE_LATEST
|
- docker push $IMAGE_LATEST
|
||||||
only:
|
rules:
|
||||||
- tags
|
- !reference [.docker, rules]
|
||||||
|
|
Reference in a new issue