slack-15.0: refactor private go dep config from #367

Signed-off-by: Tim Vaillancourt <[email protected]>

build.env

@@ -44,3 +44,8 @@ ln -sf "$PWD/misc/git/pre-commit" .git/hooks/pre-commit
 ln -sf "$PWD/misc/git/commit-msg" .git/hooks/commit-msg
 git config core.hooksPath .git/hooks
 export EXTRA_BIN=$PWD/test/bin
+
+# support private github.com/slackhq/vitess-addons repo
+if [[ -n "${GH_ACCESS_TOKEN}" ]]; then
+  git config --global url.https://${GH_ACCESS_TOKEN}@github.com/.insteadOf https://github.com/
+fi

docker/base/Dockerfile.mariadb

@@ -16,16 +16,13 @@ ARG BUILD_GIT_BRANCH
 ARG BUILD_GIT_REV
 
 # Allows private repo go dependencies
+ARG GOPRIVATE
 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
 

docker/base/Dockerfile.mariadb103

@@ -16,16 +16,13 @@ ARG BUILD_GIT_BRANCH
 ARG BUILD_GIT_REV
 
 # Allows private repo go dependencies
+ARG GOPRIVATE
 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
 

docker/base/Dockerfile.mysql80

@@ -16,16 +16,13 @@ ARG BUILD_GIT_BRANCH
 ARG BUILD_GIT_REV
 
 # Allows private repo go dependencies
+ARG GOPRIVATE
 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
 

docker/base/Dockerfile.percona57

@@ -30,16 +30,13 @@ ARG BUILD_GIT_BRANCH
 ARG BUILD_GIT_REV
 
 # Allows private repo go dependencies
+ARG GOPRIVATE
 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
 

docker/base/Dockerfile.percona80

@@ -30,16 +30,13 @@ ARG BUILD_GIT_BRANCH
 ARG BUILD_GIT_REV
 
 # Allows private repo go dependencies
+ARG GOPRIVATE
 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