github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

pause image: moves wincat binary location

Browse Source 
Co-authored-by: Ben Moss <moss.127@gmail.com>
This commit is contained in:
Claudiu Belu 2020-09-04 19:17:49 +03:00
parent 82ac28cc52
commit fd1e1138d6
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/pause/Dockerfile_windows
View File

@ -16,7 +16,7 @@ ARG BASE
FROM ${BASE} FROM ${BASE}
ARG ARCH ARG ARCH
ADD bin/pause-windows-${ARCH}.exe /pause.exe ADD bin/pause-windows-${ARCH}.exe /pause.exe
ADD windows/wincat.exe /Windows/System32/wincat.exe ADD bin/wincat-windows-amd64 /Windows/System32/wincat.exe
# NOTE(claudiub): docker buildx sets the PATH env variable to a Linux-like PATH, # NOTE(claudiub): docker buildx sets the PATH env variable to a Linux-like PATH,
# which is not desirable. See: https://github.com/moby/buildkit/issues/1560 # which is not desirable. See: https://github.com/moby/buildkit/issues/1560

4
build/pause/Makefile
View File

@ -121,8 +121,8 @@ bin/${BIN.linux}-$(OS)-$(ARCH): $(SRCS)
$(TRIPLE)-gcc $(CFLAGS) -o $@ $^ && \ $(TRIPLE)-gcc $(CFLAGS) -o $@ $^ && \
$(TRIPLE)-strip $(foreach binary, $@, ${binary}${EXTENSION})" $(TRIPLE)-strip $(foreach binary, $@, ${binary}${EXTENSION})"
bin/wincat-windows-${ARCH}: bin/wincat-windows-${ARCH}: windows/wincat/wincat.go
CGO_ENABLED=0 GOOS=windows GOARCH=${ARCH} go build -o windows/wincat.exe windows/wincat/wincat.go CGO_ENABLED=0 GOOS=windows GOARCH=${ARCH} go build -o $@ $^
container: .container-${OS}-$(ARCH) container: .container-${OS}-$(ARCH)
.container-linux-$(ARCH): bin/$(BIN)-$(OS)-$(ARCH) .container-linux-$(ARCH): bin/$(BIN)-$(OS)-$(ARCH)

4
build/pause/windows/wincat/wincat.go
View File

@ -14,9 +14,9 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
// package wincat connects to the given host and port and redirects its stdin to the connection and // package main connects to the given host and port and redirects its stdin to the connection and
// the connection's output to stdout. This is currently being used for port-forwarding for Windows Pods. // the connection's output to stdout. This is currently being used for port-forwarding for Windows Pods.
package wincat package main
import ( import (
"fmt" "fmt"