From 631eace7aa890006e57cb9cd9ee7c7b813ff8ce5 Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Wed, 14 Dec 2022 22:42:22 +0100 Subject: [PATCH 1/4] Pass BUILD_GIT_BRANCH and BUILD_GIT_REV env into docker build Signed-off-by: Tim Vaillancourt --- docker/base/Dockerfile | 9 ++++++++- docker/base/Dockerfile.mariadb | 9 ++++++++- docker/base/Dockerfile.mariadb103 | 9 ++++++++- docker/base/Dockerfile.mysql80 | 9 ++++++++- docker/base/Dockerfile.percona57 | 9 ++++++++- docker/base/Dockerfile.percona80 | 8 +++++++- 6 files changed, 47 insertions(+), 6 deletions(-) diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile index 5f6e2b501be..a3ee85ba9da 100644 --- a/docker/base/Dockerfile +++ b/docker/base/Dockerfile @@ -21,7 +21,7 @@ # TODO(mberlin): Remove the symlink and this note once # https://github.com/docker/hub-feedback/issues/292 is fixed. -ARG bootstrap_version=13 +ARG bootstrap_version=4.4 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57" FROM "${image}" @@ -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 @@ -42,3 +48,4 @@ RUN make build # Fix permissions RUN chown -R vitess:vitess /vt USER vitess + diff --git a/docker/base/Dockerfile.mariadb b/docker/base/Dockerfile.mariadb index 3d6937c861c..e1b4d6c1a6d 100644 --- a/docker/base/Dockerfile.mariadb +++ b/docker/base/Dockerfile.mariadb @@ -1,4 +1,4 @@ -ARG bootstrap_version=13 +ARG bootstrap_version=4.4 ARG image="vitess/bootstrap:${bootstrap_version}-mariadb" FROM "${image}" @@ -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 @@ -19,3 +25,4 @@ RUN make build # Fix permissions RUN chown -R vitess:vitess /vt USER vitess + diff --git a/docker/base/Dockerfile.mariadb103 b/docker/base/Dockerfile.mariadb103 index 2dd7eeea123..11ae6f2edba 100644 --- a/docker/base/Dockerfile.mariadb103 +++ b/docker/base/Dockerfile.mariadb103 @@ -1,4 +1,4 @@ -ARG bootstrap_version=13 +ARG bootstrap_version=4.4 ARG image="vitess/bootstrap:${bootstrap_version}-mariadb103" FROM "${image}" @@ -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 @@ -19,3 +25,4 @@ RUN make build # Fix permissions RUN chown -R vitess:vitess /vt USER vitess + diff --git a/docker/base/Dockerfile.mysql80 b/docker/base/Dockerfile.mysql80 index f3d054a5cde..e5fc87e107f 100644 --- a/docker/base/Dockerfile.mysql80 +++ b/docker/base/Dockerfile.mysql80 @@ -1,4 +1,4 @@ -ARG bootstrap_version=13 +ARG bootstrap_version=4.4 ARG image="vitess/bootstrap:${bootstrap_version}-mysql80" FROM "${image}" @@ -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 @@ -19,3 +25,4 @@ RUN make build # Fix permissions RUN chown -R vitess:vitess /vt USER vitess + diff --git a/docker/base/Dockerfile.percona57 b/docker/base/Dockerfile.percona57 index 30dbc8285d7..eba3eac3558 100644 --- a/docker/base/Dockerfile.percona57 +++ b/docker/base/Dockerfile.percona57 @@ -1,4 +1,4 @@ -ARG bootstrap_version=13 +ARG bootstrap_version=4.4 ARG image="vitess/bootstrap:${bootstrap_version}-percona57" FROM "${image}" @@ -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 @@ -19,3 +25,4 @@ RUN make build # Fix permissions RUN chown -R vitess:vitess /vt USER vitess + diff --git a/docker/base/Dockerfile.percona80 b/docker/base/Dockerfile.percona80 index 20787bb46c7..7595f5bde94 100644 --- a/docker/base/Dockerfile.percona80 +++ b/docker/base/Dockerfile.percona80 @@ -1,4 +1,4 @@ -ARG bootstrap_version=13 +ARG bootstrap_version=4.4 ARG image="vitess/bootstrap:${bootstrap_version}-percona80" FROM "${image}" @@ -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 From a2e75d6a0deffbc9cb7a7a0f5f8fc7a24c97720a Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Wed, 14 Dec 2022 22:44:32 +0100 Subject: [PATCH 2/4] Fix bootstrap version Signed-off-by: Tim Vaillancourt --- docker/base/Dockerfile.mariadb | 2 +- docker/base/Dockerfile.mariadb103 | 2 +- docker/base/Dockerfile.mysql80 | 2 +- docker/base/Dockerfile.percona57 | 2 +- docker/base/Dockerfile.percona80 | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker/base/Dockerfile.mariadb b/docker/base/Dockerfile.mariadb index e1b4d6c1a6d..77c3614a2cd 100644 --- a/docker/base/Dockerfile.mariadb +++ b/docker/base/Dockerfile.mariadb @@ -1,4 +1,4 @@ -ARG bootstrap_version=4.4 +ARG bootstrap_version=13 ARG image="vitess/bootstrap:${bootstrap_version}-mariadb" FROM "${image}" diff --git a/docker/base/Dockerfile.mariadb103 b/docker/base/Dockerfile.mariadb103 index 11ae6f2edba..26fd49ef6b9 100644 --- a/docker/base/Dockerfile.mariadb103 +++ b/docker/base/Dockerfile.mariadb103 @@ -1,4 +1,4 @@ -ARG bootstrap_version=4.4 +ARG bootstrap_version=13 ARG image="vitess/bootstrap:${bootstrap_version}-mariadb103" FROM "${image}" diff --git a/docker/base/Dockerfile.mysql80 b/docker/base/Dockerfile.mysql80 index e5fc87e107f..e489fd11344 100644 --- a/docker/base/Dockerfile.mysql80 +++ b/docker/base/Dockerfile.mysql80 @@ -1,4 +1,4 @@ -ARG bootstrap_version=4.4 +ARG bootstrap_version=13 ARG image="vitess/bootstrap:${bootstrap_version}-mysql80" FROM "${image}" diff --git a/docker/base/Dockerfile.percona57 b/docker/base/Dockerfile.percona57 index eba3eac3558..c6600ed6f3e 100644 --- a/docker/base/Dockerfile.percona57 +++ b/docker/base/Dockerfile.percona57 @@ -1,4 +1,4 @@ -ARG bootstrap_version=4.4 +ARG bootstrap_version=13 ARG image="vitess/bootstrap:${bootstrap_version}-percona57" FROM "${image}" diff --git a/docker/base/Dockerfile.percona80 b/docker/base/Dockerfile.percona80 index 7595f5bde94..5820c82837a 100644 --- a/docker/base/Dockerfile.percona80 +++ b/docker/base/Dockerfile.percona80 @@ -1,4 +1,4 @@ -ARG bootstrap_version=4.4 +ARG bootstrap_version=13 ARG image="vitess/bootstrap:${bootstrap_version}-percona80" FROM "${image}" From fcb3235aab9aeb7326208122d4d90a994241d43d Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Wed, 14 Dec 2022 22:45:11 +0100 Subject: [PATCH 3/4] Fix bootstrap version, again Signed-off-by: Tim Vaillancourt --- docker/base/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile index a3ee85ba9da..d335008c9f6 100644 --- a/docker/base/Dockerfile +++ b/docker/base/Dockerfile @@ -21,7 +21,7 @@ # TODO(mberlin): Remove the symlink and this note once # https://github.com/docker/hub-feedback/issues/292 is fixed. -ARG bootstrap_version=4.4 +ARG bootstrap_version=13 ARG image="vitess/bootstrap:${bootstrap_version}-mysql57" FROM "${image}" From c9a3955891140a1b22a1acbd54b0582a84474741 Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Wed, 14 Dec 2022 22:46:16 +0100 Subject: [PATCH 4/4] Fix ws Signed-off-by: Tim Vaillancourt --- docker/base/Dockerfile | 1 - docker/base/Dockerfile.mariadb | 1 - docker/base/Dockerfile.mariadb103 | 1 - docker/base/Dockerfile.mysql80 | 1 - docker/base/Dockerfile.percona57 | 1 - 5 files changed, 5 deletions(-) diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile index d335008c9f6..b42af39c5c7 100644 --- a/docker/base/Dockerfile +++ b/docker/base/Dockerfile @@ -48,4 +48,3 @@ RUN make build # Fix permissions RUN chown -R vitess:vitess /vt USER vitess - diff --git a/docker/base/Dockerfile.mariadb b/docker/base/Dockerfile.mariadb index 77c3614a2cd..4d07727619a 100644 --- a/docker/base/Dockerfile.mariadb +++ b/docker/base/Dockerfile.mariadb @@ -25,4 +25,3 @@ RUN make build # Fix permissions RUN chown -R vitess:vitess /vt USER vitess - diff --git a/docker/base/Dockerfile.mariadb103 b/docker/base/Dockerfile.mariadb103 index 26fd49ef6b9..372c1df0672 100644 --- a/docker/base/Dockerfile.mariadb103 +++ b/docker/base/Dockerfile.mariadb103 @@ -25,4 +25,3 @@ RUN make build # Fix permissions RUN chown -R vitess:vitess /vt USER vitess - diff --git a/docker/base/Dockerfile.mysql80 b/docker/base/Dockerfile.mysql80 index e489fd11344..2a22c24bb89 100644 --- a/docker/base/Dockerfile.mysql80 +++ b/docker/base/Dockerfile.mysql80 @@ -25,4 +25,3 @@ RUN make build # Fix permissions RUN chown -R vitess:vitess /vt USER vitess - diff --git a/docker/base/Dockerfile.percona57 b/docker/base/Dockerfile.percona57 index c6600ed6f3e..83f044a116f 100644 --- a/docker/base/Dockerfile.percona57 +++ b/docker/base/Dockerfile.percona57 @@ -25,4 +25,3 @@ RUN make build # Fix permissions RUN chown -R vitess:vitess /vt USER vitess -