Skip to content

Commit

Permalink
Merge pull request #232 from thaJeztah/simplify_build
Browse files Browse the repository at this point in the history
simplify "go build" commands
  • Loading branch information
thaJeztah committed Aug 21, 2022
2 parents 5a61a5b + e847de4 commit 6dfcfc1
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Expand Up @@ -102,9 +102,9 @@ RUN --mount=type=bind,target=. \
--mount=type=bind,from=version,source=/tmp/.ldflags,target=/tmp/.ldflags <<EOT
set -ex
mkdir /out
xx-go build -ldflags "$(cat /tmp/.ldflags)" -o /out/docker-credential-pass-${TARGETOS}-${TARGETARCH}${TARGETVARIANT} ./pass/cmd/main.go
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}
xx-go build -ldflags "$(cat /tmp/.ldflags)" -o /out/docker-credential-secretservice-${TARGETOS}-${TARGETARCH}${TARGETVARIANT} ./secretservice/cmd/main_linux.go
xx-go build -ldflags "$(cat /tmp/.ldflags)" -o /out/docker-credential-secretservice-${TARGETOS}-${TARGETARCH}${TARGETVARIANT} ./secretservice/cmd/
xx-verify /out/docker-credential-secretservice-${TARGETOS}-${TARGETARCH}${TARGETVARIANT}
EOT

Expand All @@ -119,7 +119,7 @@ RUN --mount=type=bind,target=. \
set -ex
mkdir /out
xx-go install std
xx-go build -ldflags "$(cat /tmp/.ldflags)" -o /out/docker-credential-osxkeychain-${TARGETARCH}${TARGETVARIANT} ./osxkeychain/cmd/main_darwin.go
xx-go build -ldflags "$(cat /tmp/.ldflags)" -o /out/docker-credential-osxkeychain-${TARGETARCH}${TARGETVARIANT} ./osxkeychain/cmd/
xx-verify /out/docker-credential-osxkeychain-${TARGETARCH}${TARGETVARIANT}
EOT

Expand All @@ -132,7 +132,7 @@ RUN --mount=type=bind,target=. \
--mount=type=bind,from=version,source=/tmp/.ldflags,target=/tmp/.ldflags <<EOT
set -ex
mkdir /out
xx-go build -ldflags "$(cat /tmp/.ldflags)" -o /out/docker-credential-wincred-${TARGETARCH}${TARGETVARIANT}.exe ./wincred/cmd/main_windows.go
xx-go build -ldflags "$(cat /tmp/.ldflags)" -o /out/docker-credential-wincred-${TARGETARCH}${TARGETVARIANT}.exe ./wincred/cmd/
xx-verify /out/docker-credential-wincred-${TARGETARCH}${TARGETVARIANT}.exe
EOT

Expand Down
8 changes: 4 additions & 4 deletions Makefile
Expand Up @@ -10,7 +10,7 @@ clean:

osxkeychain:
mkdir -p bin
go build -ldflags -s -o bin/docker-credential-osxkeychain osxkeychain/cmd/main_darwin.go
go build -ldflags -s -o bin/docker-credential-osxkeychain osxkeychain/cmd/

osxcodesign: osxkeychain
$(eval SIGNINGHASH = $(shell security find-identity -v -p codesigning | grep "Developer ID Application: Docker Inc" | cut -d ' ' -f 4))
Expand All @@ -19,15 +19,15 @@ osxcodesign: osxkeychain

secretservice:
mkdir -p bin
go build -o bin/docker-credential-secretservice secretservice/cmd/main_linux.go
go build -o bin/docker-credential-secretservice secretservice/cmd/

pass:
mkdir -p bin
go build -o bin/docker-credential-pass pass/cmd/main.go
go build -o bin/docker-credential-pass pass/cmd/

wincred:
mkdir -p bin
go build -o bin/docker-credential-wincred.exe wincred/cmd/main_windows.go
go build -o bin/docker-credential-wincred.exe wincred/cmd/

linuxrelease:
mkdir -p release
Expand Down

0 comments on commit 6dfcfc1

Please sign in to comment.