Skip to content

Commit

Permalink
Merge pull request docker#169 from ellsclytn/pass-macos-and-linux
Browse files Browse the repository at this point in the history
Allow pass helper to be built for macOS
  • Loading branch information
thaJeztah committed Aug 21, 2022
2 parents a9d6be0 + cc29c66 commit ebd9dc6
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
4 changes: 4 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ RUN --mount=type=bind,target=. \
EOT

FROM base AS build-darwin
ARG TARGETOS
ARG TARGETARCH
ARG TARGETVARIANT
RUN --mount=type=bind,target=. \
Expand All @@ -121,6 +122,9 @@ RUN --mount=type=bind,target=. \
xx-go install std
xx-go build -ldflags "$(cat /tmp/.ldflags)" -o /out/docker-credential-osxkeychain-${TARGETARCH}${TARGETVARIANT} ./osxkeychain/cmd/
xx-verify /out/docker-credential-osxkeychain-${TARGETARCH}${TARGETVARIANT}

xx-go build -ldflags "$(cat /tmp/.ldflags)" -o /out/docker-credential-pass-${TARGETOS}-${TARGETARCH}${TARGETVARIANT} ./pass/cmd/
xx-verify /out/docker-credential-pass-${TARGETOS}-${TARGETARCH}${TARGETVARIANT}
EOT

FROM base AS build-windows
Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ linuxrelease:
osxrelease:
mkdir -p release
cd bin && tar cvfz ../release/docker-credential-osxkeychain-v$(VERSION)-amd64.tar.gz docker-credential-osxkeychain
cd bin && tar cvfz ../release/docker-credential-pass-v$(VERSION)-darwin-amd64.tar.gz docker-credential-pass

winrelease:
mkdir -p release
Expand Down
2 changes: 1 addition & 1 deletion pass/pass.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
// PASS_FOLDER contains the directory where credentials are stored
const PASS_FOLDER = "docker-credential-helpers" //nolint:revive

// Pass handles secrets using Linux secret-service as a store.
// Pass handles secrets using pass as a store.
type Pass struct{}

// Ideally these would be stored as members of Pass, but since all of Pass's
Expand Down

0 comments on commit ebd9dc6

Please sign in to comment.