diff --git a/docker/base/Dockerfile.mariadb b/docker/base/Dockerfile.mariadb index 4588260b0cc..95c93f0c27e 100644 --- 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://$GH_ACCESS_TOKEN@github.com/.insteadOf https://github.com/ + # Build Vitess RUN make build diff --git a/docker/base/Dockerfile.mariadb103 b/docker/base/Dockerfile.mariadb103 index 37445e48d69..804bd739a96 100644 --- 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://$GH_ACCESS_TOKEN@github.com/.insteadOf https://github.com/ + # Build Vitess RUN make build diff --git a/docker/base/Dockerfile.mysql80 b/docker/base/Dockerfile.mysql80 index 58f8d760d8e..3a20f07dce3 100644 --- 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://$GH_ACCESS_TOKEN@github.com/.insteadOf https://github.com/ + # Build Vitess RUN make build diff --git a/docker/base/Dockerfile.percona57 b/docker/base/Dockerfile.percona57 index 4e99b987c89..8551851d379 100644 --- 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://$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 0a473579046..ac1889e1ec3 100644 --- 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://$GH_ACCESS_TOKEN@github.com/.insteadOf https://github.com/ + # Fix permissions RUN chown -R vitess:vitess /vt USER vitess