Skip to content
Snippets Groups Projects
Commit 43dd3003 authored by Moul's avatar Moul
Browse files

ci: Move DOCKERFILE_PATH in the inherited docker block

parent b6b77324
No related branches found
No related tags found
1 merge request!137Draft: (paused) Publish to GitLab container registry
...@@ -210,6 +210,8 @@ tests_release: ...@@ -210,6 +210,8 @@ tests_release:
- docker - docker
services: services:
- docker:dind - docker:dind
variables:
DOCKERFILE_PATH: "docker/Dockerfile"
before_script: before_script:
- docker info - docker info
script: script:
...@@ -229,7 +231,6 @@ deploy_docker_test_image: ...@@ -229,7 +231,6 @@ deploy_docker_test_image:
- when: manual - when: manual
allow_failure: true allow_failure: true
variables: variables:
DOCKERFILE_PATH: "docker/Dockerfile"
IMAGE_TAG: "test-image-$CI_COMMIT_SHORT_SHA" IMAGE_TAG: "test-image-$CI_COMMIT_SHORT_SHA"
deploy_docker_debug_sha: deploy_docker_debug_sha:
...@@ -239,7 +240,6 @@ deploy_docker_debug_sha: ...@@ -239,7 +240,6 @@ deploy_docker_debug_sha:
when: never when: never
- if: $CI_COMMIT_BRANCH == "master" - if: $CI_COMMIT_BRANCH == "master"
variables: variables:
DOCKERFILE_PATH: "docker/Dockerfile"
IMAGE_TAG: "debug-sha-$CI_COMMIT_SHORT_SHA" IMAGE_TAG: "debug-sha-$CI_COMMIT_SHORT_SHA"
after_script: after_script:
- docker login -u "duniterteam" -p "$DUNITERTEAM_PASSWD" - docker login -u "duniterteam" -p "$DUNITERTEAM_PASSWD"
...@@ -254,7 +254,6 @@ deploy_docker_release_sha: ...@@ -254,7 +254,6 @@ deploy_docker_release_sha:
- when: manual - when: manual
allow_failure: true allow_failure: true
variables: variables:
DOCKERFILE_PATH: "docker/Dockerfile"
IMAGE_TAG: "sha-$CI_COMMIT_SHORT_SHA" IMAGE_TAG: "sha-$CI_COMMIT_SHORT_SHA"
dependencies: dependencies:
- build_release_manual - build_release_manual
...@@ -265,7 +264,6 @@ deploy_docker_release_tag: ...@@ -265,7 +264,6 @@ deploy_docker_release_tag:
- if: "$CI_COMMIT_TAG && $CI_COMMIT_TAG =~ /^v*/" - if: "$CI_COMMIT_TAG && $CI_COMMIT_TAG =~ /^v*/"
- when: never - when: never
variables: variables:
DOCKERFILE_PATH: "docker/Dockerfile"
IMAGE_TAG: "$CI_COMMIT_TAG" IMAGE_TAG: "$CI_COMMIT_TAG"
after_script: after_script:
- docker login -u "duniterteam" -p "$DUNITERTEAM_PASSWD" - docker login -u "duniterteam" -p "$DUNITERTEAM_PASSWD"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment