From e288b4f1a42792da7cf1db69104a0ff68d80e6d5 Mon Sep 17 00:00:00 2001
From: Romain Bardou <romain@nomadic-labs.com>
Date: Fri, 16 Dec 2022 09:46:50 +0100
Subject: [PATCH 1/2] Docker: fix list of executables

---
 build.Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.Dockerfile b/build.Dockerfile
index c93c3fda88c7..85acaf368366 100644
--- a/build.Dockerfile
+++ b/build.Dockerfile
@@ -29,7 +29,7 @@ COPY --chown=tezos:nogroup vendors tezos/vendors
 ENV GIT_SHORTREF=${GIT_SHORTREF}
 ENV GIT_DATETIME=${GIT_DATETIME}
 ENV GIT_VERSION=${GIT_VERSION}
-RUN opam exec -- make -C tezos release EXECUTABLES="${EXECUTABLES}" OCTEZ_BIN_DIR=bin
+RUN opam exec -- make -C tezos release OCTEZ_EXECUTABLES="${EXECUTABLES}" OCTEZ_BIN_DIR=bin
 # Gather the parameters of all active protocols in 1 place
 RUN while read -r protocol; do \
     mkdir -p tezos/parameters/"$protocol"-parameters && \
-- 
GitLab


From 7d848e310c025c4d9d32da231f56690abeef517e Mon Sep 17 00:00:00 2001
From: Romain Bardou <romain@nomadic-labs.com>
Date: Fri, 16 Dec 2022 09:53:30 +0100
Subject: [PATCH 2/2] Scripts: rename into OCTEZ_EXECUTABLES everywhere

---
 build.Dockerfile               | 4 ++--
 scripts/ci/docker_release.sh   | 4 ++--
 scripts/create_docker_image.sh | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.Dockerfile b/build.Dockerfile
index 85acaf368366..f434c62d31b7 100644
--- a/build.Dockerfile
+++ b/build.Dockerfile
@@ -6,7 +6,7 @@ FROM ${BASE_IMAGE}:${BASE_IMAGE_VERSION}
 SHELL ["/bin/ash", "-o", "pipefail", "-c"]
 # Do not move the ARG below above the FROM or it gets erased.
 # More precisely: ARG above FROM can be used in the FROM itself, but nowhere else.
-ARG EXECUTABLES
+ARG OCTEZ_EXECUTABLES
 ARG GIT_SHORTREF
 ARG GIT_DATETIME
 ARG GIT_VERSION
@@ -29,7 +29,7 @@ COPY --chown=tezos:nogroup vendors tezos/vendors
 ENV GIT_SHORTREF=${GIT_SHORTREF}
 ENV GIT_DATETIME=${GIT_DATETIME}
 ENV GIT_VERSION=${GIT_VERSION}
-RUN opam exec -- make -C tezos release OCTEZ_EXECUTABLES="${EXECUTABLES}" OCTEZ_BIN_DIR=bin
+RUN opam exec -- make -C tezos release OCTEZ_EXECUTABLES="${OCTEZ_EXECUTABLES}" OCTEZ_BIN_DIR=bin
 # Gather the parameters of all active protocols in 1 place
 RUN while read -r protocol; do \
     mkdir -p tezos/parameters/"$protocol"-parameters && \
diff --git a/scripts/ci/docker_release.sh b/scripts/ci/docker_release.sh
index 3093d7ec6029..1a801f160381 100755
--- a/scripts/ci/docker_release.sh
+++ b/scripts/ci/docker_release.sh
@@ -20,7 +20,7 @@ if [ -z "$EXECUTABLE_FILES" ]; then
 fi
 
 # shellcheck disable=SC2086
-EXECUTABLES="$(cat $EXECUTABLE_FILES)"
+OCTEZ_EXECUTABLES="$(cat $EXECUTABLE_FILES)"
 
 # Build minimal, bare and debug images
 ./scripts/create_docker_image.sh \
@@ -28,7 +28,7 @@ EXECUTABLES="$(cat $EXECUTABLE_FILES)"
   "${DOCKER_IMAGE_TAG}" \
   "${build_deps_image_name}" \
   "${build_deps_image_version}" \
-  "${EXECUTABLES}" \
+  "${OCTEZ_EXECUTABLES}" \
   "${CI_COMMIT_SHORT_SHA}"
 
 # auth gitlab or dockerhub registry
diff --git a/scripts/create_docker_image.sh b/scripts/create_docker_image.sh
index ae827b9e8505..e2fc0e5f1432 100755
--- a/scripts/create_docker_image.sh
+++ b/scripts/create_docker_image.sh
@@ -32,7 +32,7 @@ docker build \
   --cache-from "$build_image_name:$image_version" \
   --build-arg "BASE_IMAGE=$build_deps_image_name" \
   --build-arg "BASE_IMAGE_VERSION=runtime-build-dependencies--$build_deps_image_version" \
-  --build-arg "EXECUTABLES=${executables}" \
+  --build-arg "OCTEZ_EXECUTABLES=${executables}" \
   --build-arg "GIT_SHORTREF=${commit_short_sha}" \
   --build-arg "GIT_DATETIME=${commit_datetime}" \
   --build-arg "GIT_VERSION=${commit_tag}" \
-- 
GitLab