Skip to content

Commit 6dfcfc1

Browse files
authored
Merge pull request #232 from thaJeztah/simplify_build
simplify "go build" commands
2 parents 5a61a5b + e847de4 commit 6dfcfc1

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
@@ -102,9 +102,9 @@ RUN --mount=type=bind,target=. \
102102
--mount=type=bind,from=version,source=/tmp/.ldflags,target=/tmp/.ldflags <<EOT
103103
set -ex
104104
mkdir /out
105-
xx-go build -ldflags "$(cat /tmp/.ldflags)" -o /out/docker-credential-pass-${TARGETOS}-${TARGETARCH}${TARGETVARIANT} ./pass/cmd/main.go
105+
xx-go build -ldflags "$(cat /tmp/.ldflags)" -o /out/docker-credential-pass-${TARGETOS}-${TARGETARCH}${TARGETVARIANT} ./pass/cmd/
106106
xx-verify /out/docker-credential-pass-${TARGETOS}-${TARGETARCH}${TARGETVARIANT}
107-
xx-go build -ldflags "$(cat /tmp/.ldflags)" -o /out/docker-credential-secretservice-${TARGETOS}-${TARGETARCH}${TARGETVARIANT} ./secretservice/cmd/main_linux.go
107+
xx-go build -ldflags "$(cat /tmp/.ldflags)" -o /out/docker-credential-secretservice-${TARGETOS}-${TARGETARCH}${TARGETVARIANT} ./secretservice/cmd/
108108
xx-verify /out/docker-credential-secretservice-${TARGETOS}-${TARGETARCH}${TARGETVARIANT}
109109
EOT
110110

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

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

Makefile

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

1111
osxkeychain:
1212
mkdir -p bin
13-
go build -ldflags -s -o bin/docker-credential-osxkeychain osxkeychain/cmd/main_darwin.go
13+
go build -ldflags -s -o bin/docker-credential-osxkeychain osxkeychain/cmd/
1414

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

2020
secretservice:
2121
mkdir -p bin
22-
go build -o bin/docker-credential-secretservice secretservice/cmd/main_linux.go
22+
go build -o bin/docker-credential-secretservice secretservice/cmd/
2323

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

2828
wincred:
2929
mkdir -p bin
30-
go build -o bin/docker-credential-wincred.exe wincred/cmd/main_windows.go
30+
go build -o bin/docker-credential-wincred.exe wincred/cmd/
3131

3232
linuxrelease:
3333
mkdir -p release

0 commit comments

Comments
 (0)