diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a9e1e8fde294060ed0a6b61d3bbb201e984117de..0579ed0f18c2dca55b762ce6dcf06af48b625a73 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,4 @@ -image: docker:18 - -services: - - docker:18-dind +image: docker:24 variables: POSTGRESQL_VERSION: "14.1" @@ -20,19 +17,15 @@ build: POSTGRES_DB: "viralhostrangedb" LC_COLLATE: POSIX services: - - docker:18-dind - name: postgres:${POSTGRESQL_VERSION} alias: db-test script: - if [ $CI_COMMIT_REF_SLUG == "master" ]; then export RUN_TEST="1"; fi # - export - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - # pull the latest build on master - - docker pull "$CI_REGISTRY_IMAGE:latest" || true - # pull the latest build on this branch - - docker pull "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" || true # build the image while passing commit SHA and tagging the image with it - docker build + --build-arg BUILDKIT_INLINE_CACHE=1 --build-arg CI_COMMIT_REF_SLUG --build-arg CI_COMMIT_SHA --build-arg CI_COMMIT_SHORT_SHA