From 9346eff6f889f8d24d8344cf31be087978a69418 Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Wed, 21 Dec 2022 19:46:37 +0100 Subject: [PATCH] Allow override of build git env in docker/base builds (#11968) * Pass BUILD_GIT_BRANCH and BUILD_GIT_REV env into docker build Signed-off-by: Tim Vaillancourt * Fix bootstrap version Signed-off-by: Tim Vaillancourt * Fix bootstrap version, again Signed-off-by: Tim Vaillancourt * Fix ws Signed-off-by: Tim Vaillancourt Signed-off-by: Tim Vaillancourt Signed-off-by: Florent Poinsard Co-authored-by: Florent Poinsard --- docker/base/Dockerfile | 6 ++++++ docker/base/Dockerfile.mariadb | 6 ++++++ docker/base/Dockerfile.mariadb103 | 6 ++++++ docker/base/Dockerfile.mysql80 | 6 ++++++ docker/base/Dockerfile.percona57 | 6 ++++++ docker/base/Dockerfile.percona80 | 6 ++++++ 6 files changed, 36 insertions(+) diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile index c8ce54f0ce5..633a9ae072c 100644 --- a/docker/base/Dockerfile +++ b/docker/base/Dockerfile @@ -32,6 +32,12 @@ ARG CGO_ENABLED=0 # Allows docker builds to set the BUILD_NUMBER ARG BUILD_NUMBER +# Allows docker builds to set the BUILD_GIT_BRANCH +ARG BUILD_GIT_BRANCH + +# Allows docker builds to set the BUILD_GIT_REV +ARG BUILD_GIT_REV + # Re-copy sources from working tree USER root COPY . /vt/src/vitess.io/vitess diff --git a/docker/base/Dockerfile.mariadb b/docker/base/Dockerfile.mariadb index 8ce1a4c2763..45b2589bcc2 100644 --- a/docker/base/Dockerfile.mariadb +++ b/docker/base/Dockerfile.mariadb @@ -9,6 +9,12 @@ ARG CGO_ENABLED=0 # Allows docker builds to set the BUILD_NUMBER ARG BUILD_NUMBER +# Allows docker builds to set the BUILD_GIT_BRANCH +ARG BUILD_GIT_BRANCH + +# Allows docker builds to set the BUILD_GIT_REV +ARG BUILD_GIT_REV + # Re-copy sources from working tree USER root COPY . /vt/src/vitess.io/vitess diff --git a/docker/base/Dockerfile.mariadb103 b/docker/base/Dockerfile.mariadb103 index 60ae3df9571..28f8e9e0307 100644 --- a/docker/base/Dockerfile.mariadb103 +++ b/docker/base/Dockerfile.mariadb103 @@ -9,6 +9,12 @@ ARG CGO_ENABLED=0 # Allows docker builds to set the BUILD_NUMBER ARG BUILD_NUMBER +# Allows docker builds to set the BUILD_GIT_BRANCH +ARG BUILD_GIT_BRANCH + +# Allows docker builds to set the BUILD_GIT_REV +ARG BUILD_GIT_REV + # Re-copy sources from working tree USER root COPY . /vt/src/vitess.io/vitess diff --git a/docker/base/Dockerfile.mysql80 b/docker/base/Dockerfile.mysql80 index 0c20acdc0f6..a02903c375b 100644 --- a/docker/base/Dockerfile.mysql80 +++ b/docker/base/Dockerfile.mysql80 @@ -9,6 +9,12 @@ ARG CGO_ENABLED=0 # Allows docker builds to set the BUILD_NUMBER ARG BUILD_NUMBER +# Allows docker builds to set the BUILD_GIT_BRANCH +ARG BUILD_GIT_BRANCH + +# Allows docker builds to set the BUILD_GIT_REV +ARG BUILD_GIT_REV + # Re-copy sources from working tree USER root COPY . /vt/src/vitess.io/vitess diff --git a/docker/base/Dockerfile.percona57 b/docker/base/Dockerfile.percona57 index cdabcb55693..5197919bef0 100644 --- a/docker/base/Dockerfile.percona57 +++ b/docker/base/Dockerfile.percona57 @@ -9,6 +9,12 @@ ARG CGO_ENABLED=0 # Allows docker builds to set the BUILD_NUMBER ARG BUILD_NUMBER +# Allows docker builds to set the BUILD_GIT_BRANCH +ARG BUILD_GIT_BRANCH + +# Allows docker builds to set the BUILD_GIT_REV +ARG BUILD_GIT_REV + # Re-copy sources from working tree USER root COPY . /vt/src/vitess.io/vitess diff --git a/docker/base/Dockerfile.percona80 b/docker/base/Dockerfile.percona80 index 3a2f9d0779e..9ee01d905bd 100644 --- a/docker/base/Dockerfile.percona80 +++ b/docker/base/Dockerfile.percona80 @@ -9,6 +9,12 @@ ARG CGO_ENABLED=0 # Allows docker builds to set the BUILD_NUMBER ARG BUILD_NUMBER +# Allows docker builds to set the BUILD_GIT_BRANCH +ARG BUILD_GIT_BRANCH + +# Allows docker builds to set the BUILD_GIT_REV +ARG BUILD_GIT_REV + # Re-copy sources from working tree USER root COPY . /vt/src/vitess.io/vitess