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

It didn't like that...

Browse Source
This commit is contained in:
William Miceli
2019-05-04 15:22:58 -04:00
parent f5f15ba6d7
commit a3489c9f8c
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.gitlab-ci.yml
View File

@@ -24,11 +24,7 @@ build-base:
- docker info - docker info
- 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 build \ - docker build --pull --build-arg "GRAV_VERSION=$GRAV_VERSION" -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" -t "$CI_REGISTRY_IMAGE:$GRAV_VERSION" .
--pull \
--build-arg "GRAV_VERSION=$GRAV_VERSION" -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" \
-t "$CI_REGISTRY_IMAGE:$GRAV_VERSION" \
.
#- docker push "$CI_REGISTRY_IMAGE:$GRAV_VERSION" #- docker push "$CI_REGISTRY_IMAGE:$GRAV_VERSION"
- mkdir ./images - mkdir ./images
- docker save --output "./images/$CI_REGISTRY_IMAGE_$CI_COMMIT_SHORT_SHA.tar" "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" - docker save --output "./images/$CI_REGISTRY_IMAGE_$CI_COMMIT_SHORT_SHA.tar" "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA"
@@ -44,9 +40,5 @@ build-git:
script: script:
- docker load --input "./images/$CI_REGISTRY_IMAGE_$CI_COMMIT_SHORT_SHA.tar" - docker load --input "./images/$CI_REGISTRY_IMAGE_$CI_COMMIT_SHORT_SHA.tar"
- docker image ls - docker image ls
- docker build \ - docker build --build-arg "CI_COMMIT_SHORT_SHA=$CI_COMMIT_SHORT_SHA" -f Dockerfile.git -t "$CI_REGISTRY_IMAGE:$GRAV_VERSION-git" ./git/
--build-arg "CI_COMMIT_SHORT_SHA=$CI_COMMIT_SHORT_SHA" \
-f Dockerfile.git \
-t "$CI_REGISTRY_IMAGE:$GRAV_VERSION-git" \
./git/
#- docker push "$CI_REGISTRY_IMAGE:$GRAV_VERSION-git" #- docker push "$CI_REGISTRY_IMAGE:$GRAV_VERSION-git"