Merge pull request #123 from matmerr/windows

mattfenwick · web-flow · commit ec69d5036f07 · 2022-01-13T08:15:57.000-05:00
Add Windows Dockerfile
diff --git a/cmd/cyclonus/Dockerfile.windows b/cmd/cyclonus/Dockerfile.windows
@@ -0,0 +1,8 @@
+FROM golang:windowsservercore-ltsc2022 AS builder
+WORKDIR /go/src/github.com/cyclonus/
+COPY . .
+RUN $Env:CGO_ENABLED=0; go build -v -o /cyclonus.exe ./cmd/cyclonus/
+
+FROM mcr.microsoft.com/windows/nanoserver:ltsc2022
+COPY --from=builder /cyclonus.exe cyclonus.exe
+CMD [ "cyclonus.exe" ] 
diff --git a/cmd/worker/Dockerfile b/cmd/worker/Dockerfile
@@ -1,4 +1,4 @@
-FROM k8s.gcr.io/e2e-test-images/agnhost:2.28
+FROM k8s.gcr.io/e2e-test-images/agnhost:2.33
 
 ENTRYPOINT ["/worker"]
 
diff --git a/pkg/connectivity/probe/pod.go b/pkg/connectivity/probe/pod.go
@@ -11,7 +11,7 @@ import (
 )
 
 const (
-	agnhostImage        = "k8s.gcr.io/e2e-test-images/agnhost:2.28"
+	agnhostImage        = "k8s.gcr.io/e2e-test-images/agnhost:2.33"
 	cyclonusWorkerImage = "mfenwick100/cyclonus-worker:latest"
 )
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM k8s.gcr.io/e2e-test-images/agnhost:2.28`
	`1`	`+FROM k8s.gcr.io/e2e-test-images/agnhost:2.33`
`2`	`2`
`3`	`3`	`ENTRYPOINT ["/worker"]`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`const (`
`14`		`- agnhostImage = "k8s.gcr.io/e2e-test-images/agnhost:2.28"`
	`14`	`+ agnhostImage = "k8s.gcr.io/e2e-test-images/agnhost:2.33"`
`15`	`15`	`cyclonusWorkerImage = "mfenwick100/cyclonus-worker:latest"`
`16`	`16`	`)`
`17`	`17`