Skip to content

Commit fd1e113

Browse files
claudiubelubenmoss
andcommitted
pause image: moves wincat binary location
Co-authored-by: Ben Moss <[email protected]>
1 parent 82ac28c commit fd1e113

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

build/pause/Dockerfile_windows

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ARG BASE
1616
FROM ${BASE}
1717
ARG ARCH
1818
ADD bin/pause-windows-${ARCH}.exe /pause.exe
19-
ADD windows/wincat.exe /Windows/System32/wincat.exe
19+
ADD bin/wincat-windows-amd64 /Windows/System32/wincat.exe
2020

2121
# NOTE(claudiub): docker buildx sets the PATH env variable to a Linux-like PATH,
2222
# which is not desirable. See: https://github.com/moby/buildkit/issues/1560

build/pause/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ bin/${BIN.linux}-$(OS)-$(ARCH): $(SRCS)
121121
$(TRIPLE)-gcc $(CFLAGS) -o $@ $^ && \
122122
$(TRIPLE)-strip $(foreach binary, $@, ${binary}${EXTENSION})"
123123

124-
bin/wincat-windows-${ARCH}:
125-
CGO_ENABLED=0 GOOS=windows GOARCH=${ARCH} go build -o windows/wincat.exe windows/wincat/wincat.go
124+
bin/wincat-windows-${ARCH}: windows/wincat/wincat.go
125+
CGO_ENABLED=0 GOOS=windows GOARCH=${ARCH} go build -o $@ $^
126126

127127
container: .container-${OS}-$(ARCH)
128128
.container-linux-$(ARCH): bin/$(BIN)-$(OS)-$(ARCH)

build/pause/windows/wincat/wincat.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
// package wincat connects to the given host and port and redirects its stdin to the connection and
17+
// package main connects to the given host and port and redirects its stdin to the connection and
1818
// the connection's output to stdout. This is currently being used for port-forwarding for Windows Pods.
19-
package wincat
19+
package main
2020

2121
import (
2222
"fmt"

0 commit comments

Comments
 (0)