Allow override of build git env in docker/base builds (vitessio#11968)

* Pass BUILD_GIT_BRANCH and BUILD_GIT_REV env into docker build Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> * Fix bootstrap version Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> * Fix bootstrap version, again Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> * Fix ws Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com> Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr> Co-authored-by: Florent Poinsard <florent.poinsard@outlook.fr>
slackhq · Mar 15, 2024 · e7666e4 · e7666e4
1 parent 355006a
commit e7666e4
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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