adjusted thumbnail and websocket sample

thumbnail/eventer/Dockerfile

@@ -1,9 +1,10 @@
-FROM icr.io/codeengine/golang:alpine AS bootstrap
-WORKDIR /go/src/
+FROM quay.io/projectquay/golang:1.22 AS build-env
+WORKDIR /go/src/app
 COPY . .
-RUN go build -o /eventer eventer.go
+
+RUN CGO_ENABLED=0 go build -o /go/bin/app eventer.go
 
 # Copy the exe into a smaller base image
-FROM icr.io/codeengine/alpine
-COPY --from=bootstrap /eventer /eventer
-CMD ["/eventer"]
+FROM gcr.io/distroless/static-debian12
+COPY --from=build-env /go/bin/app /
+CMD ["/app"]

thumbnail/v1/Dockerfile

@@ -1,11 +1,12 @@
-FROM icr.io/codeengine/golang:alpine AS bootstrap
-WORKDIR /go/src/
+FROM quay.io/projectquay/golang:1.22 AS build-env
+WORKDIR /go/src/app
 COPY . .
-RUN go build -o /thumbnail app.go
+
+RUN CGO_ENABLED=0 go build -o /go/bin/app app.go
 
 # Copy the exe into a smaller base image
-FROM icr.io/codeengine/alpine
-COPY --from=bootstrap /thumbnail /thumbnail
+FROM gcr.io/distroless/static-debian12
+COPY --from=build-env /go/bin/app /
 COPY page.html /
 COPY pictures/* /pictures/
-CMD ["/thumbnail"]
+CMD ["/app"]

thumbnail/v2/Dockerfile.app

@@ -1,11 +1,12 @@
-FROM icr.io/codeengine/golang AS bootstrap
-WORKDIR /go/src/
+FROM quay.io/projectquay/golang:1.22 AS build-env
+WORKDIR /go/src/app
 COPY . .
-RUN go build -o /app app.go
+
+RUN CGO_ENABLED=0 go build -o /go/bin/app app.go
 
 # Copy the exe into a smaller base image
-FROM icr.io/codeengine/ubuntu
-COPY --from=bootstrap /app /app
+FROM gcr.io/distroless/static-debian12
+COPY --from=build-env /go/bin/app /
 COPY page.html /
 COPY pictures/* /pictures/
 CMD ["/app"]

thumbnail/v2/Dockerfile.job

@@ -1,9 +1,10 @@
-FROM icr.io/codeengine/golang AS bootstrap
-WORKDIR /go/src/
+FROM quay.io/projectquay/golang:1.22 AS build-env
+WORKDIR /go/src/app
 COPY . .
-RUN go build -o /job job.go
+
+RUN CGO_ENABLED=0 go build -o /go/bin/job job.go
 
 # Copy the exe into a smaller base image
-FROM icr.io/codeengine/ubuntu
-COPY --from=bootstrap /job /job
+FROM gcr.io/distroless/static-debian12
+COPY --from=build-env /go/bin/app /
 CMD ["/job"]

websocket/Dockerfile.client

@@ -1,10 +1,11 @@
-FROM icr.io/codeengine/golang:alpine
-COPY client.go /src/
-WORKDIR /src
+FROM quay.io/projectquay/golang:1.22 AS build-env
+WORKDIR /go/src/app
+COPY client.go .
+
 RUN go mod init main && go mod tidy
-RUN go build -o /client client.go
+RUN CGO_ENABLED=0 go build -o /go/bin/app client.go
 
 # Copy the exe into a smaller base image
-FROM icr.io/codeengine/alpine
-COPY --from=0 /client /client
-ENTRYPOINT [ "/client" ]
+FROM gcr.io/distroless/static-debian12
+COPY --from=build-env /go/bin/app /
+CMD ["/app"]

websocket/Dockerfile.server

@@ -1,10 +1,11 @@
-FROM icr.io/codeengine/golang:alpine
-COPY server.go /src/
-WORKDIR /src
+FROM quay.io/projectquay/golang:1.22 AS build-env
+WORKDIR /go/src/app
+COPY server.go .
+
 RUN go mod init main && go mod tidy
-RUN go build -o /server server.go
+RUN CGO_ENABLED=0 go build -o /go/bin/app server.go
 
 # Copy the exe into a smaller base image
-FROM icr.io/codeengine/alpine
-COPY --from=0 /server /server
-ENTRYPOINT [  "/server" ]
+FROM gcr.io/distroless/static-debian12
+COPY --from=build-env /go/bin/app /
+CMD ["/app"]

websocket/run

@@ -21,15 +21,15 @@ set -ex
 export REGISTRY=${REGISTRY:-icr.io/codeengine}
 
 # Create the websocket server app
-ibmcloud ce app create -n ws-server --image ${REGISTRY}/ws-server
+ibmcloud ce app create -n ws-server --image ${REGISTRY}/ws-server --cpu 0.125 --memory 0.25G
 
 # Get the URL of the app for later use
 URL=$(ibmcloud ce app get -n ws-server -o url)
 
 # Now submit a job to run the client, passing in the URL to the App as an arg.
 # Change the protocol on the App from https to wss (secure websocket).
 # And wait for the job to finish.
-ibmcloud ce jobrun submit -n ws-client --image ${REGISTRY}/ws-client \
+ibmcloud ce jobrun submit -n ws-client --image ${REGISTRY}/ws-client --cpu 0.125 --memory 0.25G \
   --arg ${URL/https/wss} --wait
 
 # Get the overall status of the job and verify that the client exited properly