diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 50b92b645905e7add7cc399fefd3315750175f99..70b36783b3537acbd3d9fc0258d7720c6be779a6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,6 +15,9 @@ services: - name: registry.gitlab.ics.muni.cz:443/cloud/container-registry/docker:latest-dind alias: docker +variables: + DOCKER_EXE: docker + prepare-variables: stage: env-setup image: @@ -40,18 +43,15 @@ prepare-variables: build-image: extends: - - .build-image-job-template - .common-image-job-sections stage: build-image variables: EXTRA_BUILD_ARGS: '--build-arg VERSION=${VERSION}' script: - - tar czf custom-metrics-generator_files.tgz entrypoint.sh dependencies*.txt src/*.sh src/*/*.sh CHANGELOG.md Dockerfile - - echo "${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHORT_SHA}" > container-release.uri - - docker build --pull -t "$(head -1 container-release.uri)" \ - ${EXTRA_BUILD_ARGS} \ - "${CONTEXT_DIR}" - - docker push "$(head -1 container-release.uri)" + echo "${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHORT_SHA}" > container-release.uri + tar czf custom-metrics-generator_files.tgz entrypoint.sh dependencies*.txt src/*.sh src/*/*.sh CHANGELOG.md Dockerfile + ${DOCKER_EXE} build --pull -t $(head -1 container-release.uri) --build-arg "VERSION=${VERSION}" . + ${DOCKER_EXE} push $(head -1 container-release.uri) artifacts: expire_in: 2 mo name: ${CI_BUILD_NAME}-${CI_COMMIT_REF_NAME}-container-uri