Skip to content
Snippets Groups Projects
Commit 54866280 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
No related merge requests found
......@@ -210,6 +210,8 @@ tests_release:
- docker
services:
- docker:dind
variables:
DOCKERFILE_PATH: "docker/Dockerfile"
before_script:
- docker info
script:
......@@ -229,7 +231,6 @@ deploy_docker_test_image:
- when: manual
allow_failure: true
variables:
DOCKERFILE_PATH: "docker/Dockerfile"
IMAGE_TAG: "test-image-$CI_COMMIT_SHORT_SHA"
deploy_docker_debug_sha:
......@@ -239,7 +240,6 @@ deploy_docker_debug_sha:
when: never
- if: $CI_COMMIT_BRANCH == "master"
variables:
DOCKERFILE_PATH: "docker/Dockerfile"
IMAGE_TAG: "debug-sha-$CI_COMMIT_SHORT_SHA"
after_script:
- docker login -u "duniterteam" -p "$DUNITERTEAM_PASSWD"
......@@ -254,7 +254,6 @@ deploy_docker_release_sha:
- when: manual
allow_failure: true
variables:
DOCKERFILE_PATH: "docker/Dockerfile"
IMAGE_TAG: "sha-$CI_COMMIT_SHORT_SHA"
dependencies:
- build_release_manual
......@@ -265,7 +264,6 @@ deploy_docker_release_tag:
- if: "$CI_COMMIT_TAG && $CI_COMMIT_TAG =~ /^v*/"
- when: never
variables:
DOCKERFILE_PATH: "docker/Dockerfile"
IMAGE_TAG: "$CI_COMMIT_TAG"
after_script:
- docker login -u "duniterteam" -p "$DUNITERTEAM_PASSWD"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment