diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 86adca396a905780da7650fcc6210bb87fc4c90a..d644ec6e3d4b22c232fd97b772eb70392cfa33bd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,24 +10,20 @@ build: script: - docker --version # pull the latest build on master - - docker pull "$CI_REGISTRY_IMAGE/master/$DOCKERFILE_NAME:latest" || true + - docker pull "$CI_REGISTRY_IMAGE/master:latest" || true # pull the latest build on this branch - - docker pull "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG/$DOCKERFILE_NAME:latest" || true + - docker pull "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:latest" || true # build the image while passing commit SHA and tagging the image with it - docker build --build-arg CI_COMMIT_REF_SLUG --build-arg CI_COMMIT_SHA - --cache-from "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG/$DOCKERFILE_NAME:latest" - --cache-from "$CI_REGISTRY_IMAGE/master/$DOCKERFILE_NAME:latest" - --tag "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG/$DOCKERFILE_NAME:$CI_COMMIT_SHA" - --tag "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG/$DOCKERFILE_NAME:latest" - -f $DOCKERFILE_NAME + --cache-from "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:latest" + --cache-from "$CI_REGISTRY_IMAGE/master:latest" + --tag "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA" + --tag "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:latest" + -f Dockerfile2 ./ # push image as latest for the current branch - docker push "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:latest" # push image tagged with its sha - docker push "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA" - parallel: - matrix: - - DOCKERFILE_NAME: [Dockerfile, Dockerfile2] -