From 54866280db4c0f3f2ffd9102823d4b5ba5087c5a Mon Sep 17 00:00:00 2001
From: Moul <moul@moul.re>
Date: Fri, 10 Mar 2023 12:20:44 +0100
Subject: [PATCH] ci: Move DOCKERFILE_PATH in the inherited docker block
---
.gitlab-ci.yml | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6352c8a28..a729c8665 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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"
--
GitLab