Skip to content

Commit

Permalink
Ignore odd git permissions
Browse files Browse the repository at this point in the history
  • Loading branch information
sam-at-luther committed Dec 1, 2023
1 parent 9946d4d commit 42f586c
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 2 deletions.
2 changes: 2 additions & 0 deletions images/Dockerfile.build-go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ RUN git config --system url."git@github.com:luthersystems/license.git".insteadOf
RUN git config --system url."git@github.com:luthersystems/lutherauth-sdk-go.git".insteadOf "https://github.com/luthersystems/lutherauth-sdk-go"
RUN git config --system url."git@github.com:luthersystems/substrate.git".insteadOf "https://github.com/luthersystems/substrate"
RUN git config --system url."git@github.com:luthersystems/chainidentifier.git".insteadOf "https://github.com/luthersystems/chainidentifier"
RUN git config --global safe.directory '*' # Needed to support git vcs and permissions in CI

RUN ssh-keyscan -t Ed25519 -H bitbucket.org | tee -a /etc/ssh/ssh_known_hosts
RUN ssh-keyscan -t Ed25519 -H github.com | tee -a /etc/ssh/ssh_known_hosts

Expand Down
1 change: 1 addition & 0 deletions images/Dockerfile.build-go-alpine
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ RUN git config --system url."git@github.com:luthersystems/license.git".insteadOf
RUN git config --system url."git@github.com:luthersystems/lutherauth-sdk-go.git".insteadOf "https://github.com/luthersystems/lutherauth-sdk-go"
RUN git config --system url."git@github.com:luthersystems/substrate.git".insteadOf "https://github.com/luthersystems/substrate"
RUN git config --system url."git@github.com:luthersystems/chainidentifier.git".insteadOf "https://github.com/luthersystems/chainidentifier"
RUN git config --global safe.directory '*' # Needed to support git vcs and permissions in CI

RUN apk add --no-cache openssh
RUN ssh-keyscan -t Ed25519 -H bitbucket.org | tee -a /etc/ssh/ssh_known_hosts
Expand Down
2 changes: 1 addition & 1 deletion images/Dockerfile.build-go.static
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.17
FROM alpine:3.18
MAINTAINER Sam Wood <sam.wood@luthersystems.com>

RUN echo "nobody:x:1:1:nobody:/:/bin/sh" >> /etc/passwd
Expand Down
1 change: 1 addition & 0 deletions images/Dockerfile.build-godynamic
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ RUN git config --system url."git@github.com:luthersystems/license.git".insteadOf
RUN git config --system url."git@github.com:luthersystems/lutherauth-sdk-go.git".insteadOf "https://github.com/luthersystems/lutherauth-sdk-go"
RUN git config --system url."git@github.com:luthersystems/substrate.git".insteadOf "https://github.com/luthersystems/substrate"
RUN git config --system url."git@github.com:luthersystems/chainidentifier.git".insteadOf "https://github.com/luthersystems/chainidentifier"
RUN git config --global safe.directory '*' # Needed to support git vcs and permissions in CI
RUN ssh-keyscan -t Ed25519 -H bitbucket.org | tee -a /etc/ssh/ssh_known_hosts
RUN ssh-keyscan -t Ed25519 -H github.com | tee -a /etc/ssh/ssh_known_hosts

Expand Down
2 changes: 1 addition & 1 deletion images/Dockerfile.build-godynamic.static
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.17
FROM alpine:3.18
MAINTAINER Sam Wood <sam.wood@luthersystems.com>

RUN echo "nobody:x:1:1:nobody:/:/bin/sh" >> /etc/passwd
Expand Down
1 change: 1 addition & 0 deletions images/Dockerfile.build-goextra
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ RUN git config --system url."git@github.com:luthersystems/license.git".insteadOf
RUN git config --system url."git@github.com:luthersystems/lutherauth-sdk-go.git".insteadOf "https://github.com/luthersystems/lutherauth-sdk-go"
RUN git config --system url."git@github.com:luthersystems/substrate.git".insteadOf "https://github.com/luthersystems/substrate"
RUN git config --system url."git@github.com:luthersystems/chainidentifier.git".insteadOf "https://github.com/luthersystems/chainidentifier"
RUN git config --global safe.directory '*' # Needed to support git vcs and permissions in CI
RUN ssh-keyscan -t Ed25519 -H bitbucket.org | tee -a /etc/ssh/ssh_known_hosts
RUN ssh-keyscan -t Ed25519 -H github.com | tee -a /etc/ssh/ssh_known_hosts
ENV GOPRIVATE bitbucket.org/luthersystems
Expand Down

0 comments on commit 42f586c

Please sign in to comment.