Skip to content

Commit e847de4

Browse files
committed
simplify "go build" commands
There's no need to specify the file to build, as we're building the "main" packages as a whole. Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 5302241 commit e847de4

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ RUN --mount=type=bind,target=. \
8181
--mount=type=bind,from=version,source=/tmp/.ldflags,target=/tmp/.ldflags <<EOT
8282
set -ex
8383
mkdir /out
84-
xx-go build -ldflags "$(cat /tmp/.ldflags)" -o /out/docker-credential-pass-${TARGETOS}-${TARGETARCH}${TARGETVARIANT} ./pass/cmd/main.go
84+
xx-go build -ldflags "$(cat /tmp/.ldflags)" -o /out/docker-credential-pass-${TARGETOS}-${TARGETARCH}${TARGETVARIANT} ./pass/cmd/
8585
xx-verify /out/docker-credential-pass-${TARGETOS}-${TARGETARCH}${TARGETVARIANT}
86-
xx-go build -ldflags "$(cat /tmp/.ldflags)" -o /out/docker-credential-secretservice-${TARGETOS}-${TARGETARCH}${TARGETVARIANT} ./secretservice/cmd/main_linux.go
86+
xx-go build -ldflags "$(cat /tmp/.ldflags)" -o /out/docker-credential-secretservice-${TARGETOS}-${TARGETARCH}${TARGETVARIANT} ./secretservice/cmd/
8787
xx-verify /out/docker-credential-secretservice-${TARGETOS}-${TARGETARCH}${TARGETVARIANT}
8888
EOT
8989

@@ -98,7 +98,7 @@ RUN --mount=type=bind,target=. \
9898
set -ex
9999
mkdir /out
100100
xx-go install std
101-
xx-go build -ldflags "$(cat /tmp/.ldflags)" -o /out/docker-credential-osxkeychain-${TARGETARCH}${TARGETVARIANT} ./osxkeychain/cmd/main_darwin.go
101+
xx-go build -ldflags "$(cat /tmp/.ldflags)" -o /out/docker-credential-osxkeychain-${TARGETARCH}${TARGETVARIANT} ./osxkeychain/cmd/
102102
xx-verify /out/docker-credential-osxkeychain-${TARGETARCH}${TARGETVARIANT}
103103
EOT
104104

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

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ clean:
1414

1515
osxkeychain:
1616
mkdir -p bin
17-
go build -ldflags -s -o bin/docker-credential-osxkeychain osxkeychain/cmd/main_darwin.go
17+
go build -ldflags -s -o bin/docker-credential-osxkeychain osxkeychain/cmd/
1818

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

2424
secretservice:
2525
mkdir -p bin
26-
go build -o bin/docker-credential-secretservice secretservice/cmd/main_linux.go
26+
go build -o bin/docker-credential-secretservice secretservice/cmd/
2727

2828
pass:
2929
mkdir -p bin
30-
go build -o bin/docker-credential-pass pass/cmd/main.go
30+
go build -o bin/docker-credential-pass pass/cmd/
3131

3232
wincred:
3333
mkdir -p bin
34-
go build -o bin/docker-credential-wincred.exe wincred/cmd/main_windows.go
34+
go build -o bin/docker-credential-wincred.exe wincred/cmd/
3535

3636
linuxrelease:
3737
mkdir -p release

0 commit comments

Comments
 (0)