From c9c227db69b8f30cc90a43fa023e0d545964713b Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Thu, 20 Feb 2025 23:24:11 +0100 Subject: [PATCH] Allow build git envs to be set in `docker/lite` (#17827) Signed-off-by: Tim Vaillancourt --- docker/lite/Dockerfile | 9 +++++++++ docker/lite/Dockerfile.mysql84 | 9 +++++++++ docker/lite/Dockerfile.percona80 | 9 +++++++++ 3 files changed, 27 insertions(+) diff --git a/docker/lite/Dockerfile b/docker/lite/Dockerfile index 70d4787686c..beeb0cfef8c 100644 --- a/docker/lite/Dockerfile +++ b/docker/lite/Dockerfile @@ -17,6 +17,15 @@ FROM --platform=linux/amd64 golang:1.24.0-bookworm AS builder # 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 + +# Allows docker builds to set the BUILD_TIME +ARG BUILD_TIME + WORKDIR /vt/src/vitess.io/vitess # Create vitess user diff --git a/docker/lite/Dockerfile.mysql84 b/docker/lite/Dockerfile.mysql84 index 047e3d1f90c..f47758754ae 100644 --- a/docker/lite/Dockerfile.mysql84 +++ b/docker/lite/Dockerfile.mysql84 @@ -17,6 +17,15 @@ FROM --platform=linux/amd64 golang:1.24.0-bookworm AS builder # 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 + +# Allows docker builds to set the BUILD_TIME +ARG BUILD_TIME + WORKDIR /vt/src/vitess.io/vitess # Create vitess user diff --git a/docker/lite/Dockerfile.percona80 b/docker/lite/Dockerfile.percona80 index 011f20c4022..9a7626244ec 100644 --- a/docker/lite/Dockerfile.percona80 +++ b/docker/lite/Dockerfile.percona80 @@ -17,6 +17,15 @@ FROM --platform=linux/amd64 golang:1.24.0-bookworm AS builder # 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 + +# Allows docker builds to set the BUILD_TIME +ARG BUILD_TIME + WORKDIR /vt/src/vitess.io/vitess # Create vitess user