Skip to content

Commit ebd9dc6

Browse files
authored
Merge pull request #169 from ellsclytn/pass-macos-and-linux
Allow pass helper to be built for macOS
2 parents a9d6be0 + cc29c66 commit ebd9dc6

File tree

3 files changed

+6
-1
lines changed

3 files changed

+6
-1
lines changed

Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ RUN --mount=type=bind,target=. \
109109
EOT
110110

111111
FROM base AS build-darwin
112+
ARG TARGETOS
112113
ARG TARGETARCH
113114
ARG TARGETVARIANT
114115
RUN --mount=type=bind,target=. \
@@ -121,6 +122,9 @@ RUN --mount=type=bind,target=. \
121122
xx-go install std
122123
xx-go build -ldflags "$(cat /tmp/.ldflags)" -o /out/docker-credential-osxkeychain-${TARGETARCH}${TARGETVARIANT} ./osxkeychain/cmd/
123124
xx-verify /out/docker-credential-osxkeychain-${TARGETARCH}${TARGETVARIANT}
125+
126+
xx-go build -ldflags "$(cat /tmp/.ldflags)" -o /out/docker-credential-pass-${TARGETOS}-${TARGETARCH}${TARGETVARIANT} ./pass/cmd/
127+
xx-verify /out/docker-credential-pass-${TARGETOS}-${TARGETARCH}${TARGETVARIANT}
124128
EOT
125129

126130
FROM base AS build-windows

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ linuxrelease:
3737
osxrelease:
3838
mkdir -p release
3939
cd bin && tar cvfz ../release/docker-credential-osxkeychain-v$(VERSION)-amd64.tar.gz docker-credential-osxkeychain
40+
cd bin && tar cvfz ../release/docker-credential-pass-v$(VERSION)-darwin-amd64.tar.gz docker-credential-pass
4041

4142
winrelease:
4243
mkdir -p release

pass/pass.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
// PASS_FOLDER contains the directory where credentials are stored
2323
const PASS_FOLDER = "docker-credential-helpers" //nolint:revive
2424

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

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

0 commit comments

Comments
 (0)