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

Little cleanup/organizing

Browse Source
This commit is contained in:
WilliamMiceli
2019-05-04 16:53:17 -04:00
parent 2b6a6e48be
commit 70c37ea32a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@@ -24,10 +24,10 @@ build-base:
before_script: before_script:
- 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
- mkdir ./images
script: script:
- docker build --pull --build-arg "GRAV_VERSION=$GRAV_VERSION" -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA" -t "$CI_REGISTRY_IMAGE:$GRAV_VERSION" . - docker build --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
- 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"
build-git: build-git:
@@ -38,8 +38,8 @@ build-git:
- pushes - pushes
tags: tags:
- docker - docker
script: before_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 script:
- docker build --build-arg "CI_COMMIT_SHORT_SHA=$CI_COMMIT_SHORT_SHA" -f ./variants/Dockerfile-git -t "$CI_REGISTRY_IMAGE:$GRAV_VERSION-git" . - docker build --build-arg "CI_COMMIT_SHORT_SHA=$CI_COMMIT_SHORT_SHA" -f ./variants/Dockerfile-git -t "$CI_REGISTRY_IMAGE:$GRAV_VERSION-git" .
#- docker push "$CI_REGISTRY_IMAGE:$GRAV_VERSION-git" #- docker push "$CI_REGISTRY_IMAGE:$GRAV_VERSION-git"