slack-15.0: fix private repo git config in docker build

Signed-off-by: Tim Vaillancourt <[email protected]>
slackhq · May 23, 2024 · 2639380 · 2639380
1 parent e9875f2
commit 2639380
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 0 deletions.
diff --git a/docker/base/Dockerfile.mariadb b/docker/base/Dockerfile.mariadb
@@ -15,10 +15,17 @@ ARG BUILD_GIT_BRANCH
 # Allows docker builds to set the BUILD_GIT_REV
 ARG BUILD_GIT_REV
 
+# Allows private repo go dependencies
+ARG GH_ACCESS_TOKEN
+
 # Re-copy sources from working tree
 USER root
 COPY . /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://[email protected]/.insteadOf https://github.com/
+
 # Build Vitess
 RUN make build
 

diff --git a/docker/base/Dockerfile.mariadb103 b/docker/base/Dockerfile.mariadb103
@@ -15,10 +15,17 @@ ARG BUILD_GIT_BRANCH
 # Allows docker builds to set the BUILD_GIT_REV
 ARG BUILD_GIT_REV
 
+# Allows private repo go dependencies
+ARG GH_ACCESS_TOKEN
+
 # Re-copy sources from working tree
 USER root
 COPY . /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://[email protected]/.insteadOf https://github.com/
+
 # Build Vitess
 RUN make build
 

diff --git a/docker/base/Dockerfile.mysql80 b/docker/base/Dockerfile.mysql80
@@ -15,10 +15,17 @@ ARG BUILD_GIT_BRANCH
 # Allows docker builds to set the BUILD_GIT_REV
 ARG BUILD_GIT_REV
 
+# Allows private repo go dependencies
+ARG GH_ACCESS_TOKEN
+
 # Re-copy sources from working tree
 USER root
 COPY . /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://[email protected]/.insteadOf https://github.com/
+
 # Build Vitess
 RUN make build
 

diff --git a/docker/base/Dockerfile.percona57 b/docker/base/Dockerfile.percona57
@@ -29,10 +29,17 @@ ARG BUILD_GIT_BRANCH
 # Allows docker builds to set the BUILD_GIT_REV
 ARG BUILD_GIT_REV
 
+# Allows private repo go dependencies
+ARG GH_ACCESS_TOKEN
+
 # Re-copy sources from working tree
 USER root
 COPY . /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://[email protected]/.insteadOf https://github.com/
+
 # Build Vitess
 RUN make build
 

diff --git a/docker/base/Dockerfile.percona80 b/docker/base/Dockerfile.percona80
@@ -29,10 +29,17 @@ ARG BUILD_GIT_BRANCH
 # Allows docker builds to set the BUILD_GIT_REV
 ARG BUILD_GIT_REV
 
+# Allows private repo go dependencies
+ARG GH_ACCESS_TOKEN
+
 # Re-copy sources from working tree
 USER root
 COPY . /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://[email protected]/.insteadOf https://github.com/
+
 # Fix permissions
 RUN chown -R vitess:vitess /vt
 USER vitess