改进
This commit is contained in:
parent
132413bf61
commit
79dbea1611
@ -15,23 +15,24 @@ docker-build:
|
|||||||
image: docker:cli
|
image: docker:cli
|
||||||
stage: build
|
stage: build
|
||||||
services:
|
services:
|
||||||
- docker:dind
|
- docker:dind
|
||||||
variables:
|
variables:
|
||||||
DOCKER_IMAGE_NAME: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
|
DOCKER_IMAGE_NAME: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
|
||||||
before_script:
|
before_script:
|
||||||
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
|
- sh pull.sh
|
||||||
|
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
|
||||||
# All branches are tagged with $DOCKER_IMAGE_NAME (defaults to commit ref slug)
|
# All branches are tagged with $DOCKER_IMAGE_NAME (defaults to commit ref slug)
|
||||||
# Default branch is also tagged with `latest`
|
# Default branch is also tagged with `latest`
|
||||||
script:
|
script:
|
||||||
- docker build --pull -t "$DOCKER_IMAGE_NAME" .
|
- docker build --pull -t "$DOCKER_IMAGE_NAME" .
|
||||||
- docker push "$DOCKER_IMAGE_NAME"
|
- docker push "$DOCKER_IMAGE_NAME"
|
||||||
- |
|
- |
|
||||||
if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then
|
if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then
|
||||||
docker tag "$DOCKER_IMAGE_NAME" "$CI_REGISTRY_IMAGE:latest"
|
docker tag "$DOCKER_IMAGE_NAME" "$CI_REGISTRY_IMAGE:latest"
|
||||||
docker push "$CI_REGISTRY_IMAGE:latest"
|
docker push "$CI_REGISTRY_IMAGE:latest"
|
||||||
fi
|
fi
|
||||||
# Run this job in a branch where a Dockerfile exists
|
# Run this job in a branch where a Dockerfile exists
|
||||||
rules:
|
rules:
|
||||||
- if: $CI_COMMIT_BRANCH
|
- if: $CI_COMMIT_BRANCH
|
||||||
exists:
|
exists:
|
||||||
- Dockerfile
|
- Dockerfile
|
||||||
|
Loading…
Reference in New Issue
Block a user