From bfac3047b229ff0ca58f6ced15d43a91d2ca5617 Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Wed, 17 Jul 2024 22:13:55 +0200 Subject: [PATCH] `slack-19.0`: fix docker base build + git private repo Signed-off-by: Tim Vaillancourt --- docker/base/Dockerfile | 7 +++++++ docker/base/Dockerfile.mysql57 | 7 +++++++ docker/base/Dockerfile.percona57 | 7 +++++++ docker/base/Dockerfile.percona80 | 7 +++++++ 4 files changed, 28 insertions(+) diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile index ddb987480fc..1db25591f71 100644 --- a/docker/base/Dockerfile +++ b/docker/base/Dockerfile @@ -32,9 +32,16 @@ ARG BUILD_GIT_REV # Allows docker builds to set the BUILD_TIME ARG BUILD_TIME +# Allows private repo go dependencies +ARG GH_ACCESS_TOKEN + # Re-copy sources from working tree COPY --chown=vitess:vitess . /vt/src/vitess.io/vitess +# Allow checkout of github.com/slackhq/vitess-addons (private repo) +ENV GOPRIVATE=github.com/slackhq/vitess-addons +RUN git config --global url.https://$GH_ACCESS_TOKEN@github.com/.insteadOf https://github.com/ + USER vitess # Build Vitess diff --git a/docker/base/Dockerfile.mysql57 b/docker/base/Dockerfile.mysql57 index 13c7e175912..8d66a1e3604 100644 --- a/docker/base/Dockerfile.mysql57 +++ b/docker/base/Dockerfile.mysql57 @@ -32,9 +32,16 @@ ARG BUILD_GIT_REV # Allows docker builds to set the BUILD_TIME ARG BUILD_TIME +# Allows private repo go dependencies +ARG GH_ACCESS_TOKEN + # Re-copy sources from working tree COPY --chown=vitess:vitess . /vt/src/vitess.io/vitess +# Allow checkout of github.com/slackhq/vitess-addons (private repo) +ENV GOPRIVATE=github.com/slackhq/vitess-addons +RUN git config --global url.https://$GH_ACCESS_TOKEN@github.com/.insteadOf https://github.com/ + USER vitess # Build Vitess diff --git a/docker/base/Dockerfile.percona57 b/docker/base/Dockerfile.percona57 index f495622064b..d73eed5b917 100644 --- a/docker/base/Dockerfile.percona57 +++ b/docker/base/Dockerfile.percona57 @@ -32,10 +32,17 @@ ARG BUILD_GIT_REV # Allows docker builds to set the BUILD_TIME ARG BUILD_TIME +# Allows private repo go dependencies +ARG GH_ACCESS_TOKEN + # Re-copy sources from working tree COPY --chown=vitess:vitess . /vt/src/vitess.io/vitess USER vitess +# Allow checkout of github.com/slackhq/vitess-addons (private repo) +ENV GOPRIVATE=github.com/slackhq/vitess-addons +RUN git config --global url.https://$GH_ACCESS_TOKEN@github.com/.insteadOf https://github.com/ + # Build Vitess RUN make build diff --git a/docker/base/Dockerfile.percona80 b/docker/base/Dockerfile.percona80 index 3c42a29660b..597979e05ea 100644 --- a/docker/base/Dockerfile.percona80 +++ b/docker/base/Dockerfile.percona80 @@ -32,9 +32,16 @@ ARG BUILD_GIT_REV # Allows docker builds to set the BUILD_TIME ARG BUILD_TIME +# Allows private repo go dependencies +ARG GH_ACCESS_TOKEN + # Re-copy sources from working tree COPY --chown=vitess:vitess . /vt/src/vitess.io/vitess +# Allow checkout of github.com/slackhq/vitess-addons (private repo) +ENV GOPRIVATE=github.com/slackhq/vitess-addons +RUN git config --global url.https://$GH_ACCESS_TOKEN@github.com/.insteadOf https://github.com/ + USER vitess # Build Vitess