slack-19.0: fix docker base build + git private repo

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>
slackhq · Jul 17, 2024 · bfac304 · bfac304
1 parent 27199c5
commit bfac304
Show file tree

Hide file tree

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