From 0b7b90a9cab0e09d5c7b5edd3899654b96e8a6b5 Mon Sep 17 00:00:00 2001
From: Killian Delarue <killian.delarue@nomadic-labs.com>
Date: Mon, 15 Dec 2025 18:05:01 +0100
Subject: [PATCH] Docker: Do not publish master branch Docker images on
 DockerHub

---
 .gitlab/ci/pipelines/master_branch.yml                  | 6 +++---
 .gitlab/ci/pipelines/schedule_docker_build_pipeline.yml | 6 +++---
 ci/lib_tezos_ci_jobs/common.ml                          | 4 ++--
 ci/lib_tezos_ci_jobs/master_branch.ml                   | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.gitlab/ci/pipelines/master_branch.yml b/.gitlab/ci/pipelines/master_branch.yml
index d24129edfbc7..5dc27a7215cb 100644
--- a/.gitlab/ci/pipelines/master_branch.yml
+++ b/.gitlab/ci/pipelines/master_branch.yml
@@ -390,7 +390,7 @@ oc.docker:amd64:
   - docker:${DOCKER_VERSION}-dind
   variables:
     DOCKER_VERSION: 24.0.7
-    CI_DOCKER_HUB: "true"
+    CI_DOCKER_HUB: "false"
     DOCKER_BUILD_TARGET: with-evm-artifacts
     IMAGE_ARCH_PREFIX: amd64_
     EXECUTABLE_FILES: script-inputs/released-executables script-inputs/experimental-executables
@@ -419,7 +419,7 @@ oc.docker:arm64:
   - docker:${DOCKER_VERSION}-dind
   variables:
     DOCKER_VERSION: 24.0.7
-    CI_DOCKER_HUB: "true"
+    CI_DOCKER_HUB: "false"
     DOCKER_BUILD_TARGET: without-evm-artifacts
     IMAGE_ARCH_PREFIX: arm64_
     EXECUTABLE_FILES: script-inputs/released-executables script-inputs/experimental-executables
@@ -448,7 +448,7 @@ docker:merge_manifests:
   - docker:${DOCKER_VERSION}-dind
   variables:
     DOCKER_VERSION: 24.0.7
-    CI_DOCKER_HUB: "true"
+    CI_DOCKER_HUB: "false"
   retry: 0
 
 publish_kernel_sdk:
diff --git a/.gitlab/ci/pipelines/schedule_docker_build_pipeline.yml b/.gitlab/ci/pipelines/schedule_docker_build_pipeline.yml
index db5433e90425..530e72335627 100644
--- a/.gitlab/ci/pipelines/schedule_docker_build_pipeline.yml
+++ b/.gitlab/ci/pipelines/schedule_docker_build_pipeline.yml
@@ -137,7 +137,7 @@ oc.docker:amd64:
   - docker:${DOCKER_VERSION}-dind
   variables:
     DOCKER_VERSION: 24.0.7
-    CI_DOCKER_HUB: "true"
+    CI_DOCKER_HUB: "false"
     DOCKER_BUILD_TARGET: with-evm-artifacts
     IMAGE_ARCH_PREFIX: amd64_
     EXECUTABLE_FILES: script-inputs/released-executables script-inputs/experimental-executables
@@ -166,7 +166,7 @@ oc.docker:arm64:
   - docker:${DOCKER_VERSION}-dind
   variables:
     DOCKER_VERSION: 24.0.7
-    CI_DOCKER_HUB: "true"
+    CI_DOCKER_HUB: "false"
     DOCKER_BUILD_TARGET: without-evm-artifacts
     IMAGE_ARCH_PREFIX: arm64_
     EXECUTABLE_FILES: script-inputs/released-executables script-inputs/experimental-executables
@@ -195,5 +195,5 @@ docker:merge_manifests:
   - docker:${DOCKER_VERSION}-dind
   variables:
     DOCKER_VERSION: 24.0.7
-    CI_DOCKER_HUB: "true"
+    CI_DOCKER_HUB: "false"
   retry: 0
diff --git a/ci/lib_tezos_ci_jobs/common.ml b/ci/lib_tezos_ci_jobs/common.ml
index 5b20d25cc773..06ada3da0057 100644
--- a/ci/lib_tezos_ci_jobs/common.ml
+++ b/ci/lib_tezos_ci_jobs/common.ml
@@ -327,8 +327,8 @@ module Docker = struct
     let arch_string = Runner.Arch.show_uniform arch in
     let ci_docker_hub =
       match docker_build_type with
-      | Release | Octez_evm_node_release | Experimental -> true
-      | Test | Test_manual -> false
+      | Release | Octez_evm_node_release -> true
+      | Experimental | Test | Test_manual -> false
     in
     (* Whether to include evm artifacts.
      Including these artifacts requires the rust-toolchain image. *)
diff --git a/ci/lib_tezos_ci_jobs/master_branch.ml b/ci/lib_tezos_ci_jobs/master_branch.ml
index ffd315c43b31..14e39f7d5e9b 100644
--- a/ci/lib_tezos_ci_jobs/master_branch.ml
+++ b/ci/lib_tezos_ci_jobs/master_branch.ml
@@ -61,7 +61,7 @@ let octez_distribution_docker_jobs =
   let job_docker_merge_manifests =
     job_docker_merge_manifests
       ~__POS__
-      ~ci_docker_hub:true
+      ~ci_docker_hub:false
       ~job_docker_amd64:job_docker_amd64_experimental
       ~job_docker_arm64:job_docker_arm64_experimental
   in
-- 
GitLab