William/Docker_Grav
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup not needed; testing fix for image names

Browse Source
This commit is contained in:
William Miceli
2019-03-28 16:49:43 -04:00
parent 205153e562
commit 0fc5441bac
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.gitlab-ci.yml
View File

@@ -6,7 +6,6 @@ services:
stages: stages:
- Build Image - Build Image
- Push to Docker Hub - Push to Docker Hub
- Cleanup Runner
variables: variables:
DOCKER_HOST: tcp://docker:2375/ DOCKER_HOST: tcp://docker:2375/
@@ -17,14 +16,14 @@ build:
- docker info - docker info
stage: Build Image stage: Build Image
script: script:
- docker build --pull -t "$CI_COMMIT_SHORT_SHA" . - docker build --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" .
push-master: push-master:
stage: Push to Docker Hub stage: Push to Docker Hub
before_script: before_script:
- echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin
script: script:
- docker tag "$CI_COMMIT_SHORT_SHA" "$CI_REGISTRY_IMAGE" - docker tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" "$CI_REGISTRY_IMAGE"
- docker push "$CI_REGISTRY_IMAGE" "$CI_REGISTRY_URL" - docker push "$CI_REGISTRY_IMAGE" "$CI_REGISTRY_URL"
after_script: after_script:
- docker logout - docker logout
@@ -36,15 +35,9 @@ push-other:
before_script: before_script:
- echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin - echo "$CI_REGISTRY_PASSWORD" | docker login -u "$CI_REGISTRY_USER" --password-stdin
script: script:
- docker tag "$CI_COMMIT_SHORT_SHA" "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME" - docker tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME"
- docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME" "$CI_REGISTRY_URL" - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME" "$CI_REGISTRY_URL"
after_script: after_script:
- docker logout - docker logout
except: except:
- master - master
cleanup:
stage: Cleanup Runner
script:
- docker image prune --all --force
when: always