Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
May 28, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions build.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 1 addition & 4 deletions docker/base/Dockerfile.mariadb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 1 addition & 4 deletions docker/base/Dockerfile.mariadb103
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 1 addition & 4 deletions docker/base/Dockerfile.mysql80
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 1 addition & 4 deletions docker/base/Dockerfile.percona57
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 1 addition & 4 deletions docker/base/Dockerfile.percona80
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading