From a9eb4dba40cf47de2c02e3217d97db52d099a2ee Mon Sep 17 00:00:00 2001 From: Ricardo Katz Date: Sun, 14 Jan 2024 22:09:13 -0300 Subject: [PATCH] Use dockerhub for e2e and demo images (#10851) --- .github/workflows/images.yaml | 8 ++++++++ images/cfssl/TAG | 2 +- images/cfssl/rootfs/Dockerfile | 2 +- images/custom-error-pages/TAG | 2 +- images/custom-error-pages/rootfs/Dockerfile | 2 +- images/e2e-test-echo/TAG | 2 +- images/e2e-test-echo/rootfs/Dockerfile | 2 +- images/ext-auth-example-authsvc/TAG | 2 +- images/ext-auth-example-authsvc/cloudbuild.yaml | 2 +- images/ext-auth-example-authsvc/rootfs/Dockerfile | 2 +- images/fastcgi-helloserver/TAG | 2 +- images/fastcgi-helloserver/cloudbuild.yaml | 3 +-- images/fastcgi-helloserver/rootfs/Dockerfile | 2 +- images/go-grpc-greeter-server/TAG | 2 +- images/go-grpc-greeter-server/cloudbuild.yaml | 2 +- images/go-grpc-greeter-server/rootfs/Dockerfile | 2 +- images/httpbun/TAG | 2 +- images/httpbun/cloudbuild.yaml | 2 +- images/httpbun/rootfs/Dockerfile | 2 +- 19 files changed, 26 insertions(+), 19 deletions(-) diff --git a/.github/workflows/images.yaml b/.github/workflows/images.yaml index 42921e5fa9..45a7be4700 100644 --- a/.github/workflows/images.yaml +++ b/.github/workflows/images.yaml @@ -72,6 +72,7 @@ jobs: uses: ./.github/workflows/zz-tmpl-images.yaml with: name: cfssl + secrets: inherit custom-error-pages: needs: changes @@ -80,6 +81,8 @@ jobs: uses: ./.github/workflows/zz-tmpl-images.yaml with: name: custom-error-pages + secrets: inherit + e2e-test-echo: needs: changes @@ -88,6 +91,7 @@ jobs: uses: ./.github/workflows/zz-tmpl-images.yaml with: name: e2e-test-echo + secrets: inherit ext-auth-example-authsvc: needs: changes @@ -96,6 +100,7 @@ jobs: uses: ./.github/workflows/zz-tmpl-images.yaml with: name: ext-auth-example-authsvc + secrets: inherit fastcgi-helloserver: needs: changes @@ -104,6 +109,7 @@ jobs: uses: ./.github/workflows/zz-tmpl-images.yaml with: name: fastcgi-helloserver + secrets: inherit go-grpc-greeter-server: needs: changes @@ -112,6 +118,7 @@ jobs: uses: ./.github/workflows/zz-tmpl-images.yaml with: name: go-grpc-greeter-server + secrets: inherit httpbun: needs: changes @@ -120,6 +127,7 @@ jobs: uses: ./.github/workflows/zz-tmpl-images.yaml with: name: httpbun + secrets: inherit kube-webhook-certgen: runs-on: ubuntu-latest diff --git a/images/cfssl/TAG b/images/cfssl/TAG index 90ab6e946e..8ce995b80e 100644 --- a/images/cfssl/TAG +++ b/images/cfssl/TAG @@ -1 +1 @@ -v0.0.2 \ No newline at end of file +v0.0.3 \ No newline at end of file diff --git a/images/cfssl/rootfs/Dockerfile b/images/cfssl/rootfs/Dockerfile index 3b6c36f749..2d3f30ab41 100644 --- a/images/cfssl/rootfs/Dockerfile +++ b/images/cfssl/rootfs/Dockerfile @@ -23,4 +23,4 @@ RUN apk update \ EXPOSE 8888 -CMD ["cfssl"] +CMD ["cfssl"] \ No newline at end of file diff --git a/images/custom-error-pages/TAG b/images/custom-error-pages/TAG index 90ab6e946e..8ce995b80e 100644 --- a/images/custom-error-pages/TAG +++ b/images/custom-error-pages/TAG @@ -1 +1 @@ -v0.0.2 \ No newline at end of file +v0.0.3 \ No newline at end of file diff --git a/images/custom-error-pages/rootfs/Dockerfile b/images/custom-error-pages/rootfs/Dockerfile index 3647788d4f..5cf446962f 100755 --- a/images/custom-error-pages/rootfs/Dockerfile +++ b/images/custom-error-pages/rootfs/Dockerfile @@ -35,4 +35,4 @@ COPY --from=builder /go/src/k8s.io/ingress-nginx/images/custom-error-pages/www / COPY --from=builder /go/src/k8s.io/ingress-nginx/images/custom-error-pages/etc /etc USER nonroot:nonroot -CMD ["/nginx-errors"] +CMD ["/nginx-errors"] \ No newline at end of file diff --git a/images/e2e-test-echo/TAG b/images/e2e-test-echo/TAG index 90ab6e946e..8ce995b80e 100644 --- a/images/e2e-test-echo/TAG +++ b/images/e2e-test-echo/TAG @@ -1 +1 @@ -v0.0.2 \ No newline at end of file +v0.0.3 \ No newline at end of file diff --git a/images/e2e-test-echo/rootfs/Dockerfile b/images/e2e-test-echo/rootfs/Dockerfile index c4ab265611..eaa9198355 100644 --- a/images/e2e-test-echo/rootfs/Dockerfile +++ b/images/e2e-test-echo/rootfs/Dockerfile @@ -17,4 +17,4 @@ RUN wget -O /tmp/luarocks.tgz \ RUN luarocks install lua-resty-template -COPY nginx.conf /etc/nginx/nginx.conf +COPY nginx.conf /etc/nginx/nginx.conf \ No newline at end of file diff --git a/images/ext-auth-example-authsvc/TAG b/images/ext-auth-example-authsvc/TAG index 90ab6e946e..8ce995b80e 100644 --- a/images/ext-auth-example-authsvc/TAG +++ b/images/ext-auth-example-authsvc/TAG @@ -1 +1 @@ -v0.0.2 \ No newline at end of file +v0.0.3 \ No newline at end of file diff --git a/images/ext-auth-example-authsvc/cloudbuild.yaml b/images/ext-auth-example-authsvc/cloudbuild.yaml index 3d06caf681..506e20111f 100644 --- a/images/ext-auth-example-authsvc/cloudbuild.yaml +++ b/images/ext-auth-example-authsvc/cloudbuild.yaml @@ -16,4 +16,4 @@ steps: - -c - | gcloud auth configure-docker \ - && cd images/ && make NAME=ext-auth-example-authsvc push + && cd images/ && make NAME=ext-auth-example-authsvc push \ No newline at end of file diff --git a/images/ext-auth-example-authsvc/rootfs/Dockerfile b/images/ext-auth-example-authsvc/rootfs/Dockerfile index f856983986..5ae719675d 100644 --- a/images/ext-auth-example-authsvc/rootfs/Dockerfile +++ b/images/ext-auth-example-authsvc/rootfs/Dockerfile @@ -7,4 +7,4 @@ RUN CGO_ENABLED=0 GOOS=linux go build -o authsvc authsvc.go FROM gcr.io/distroless/base-debian11 COPY --from=builder /authsvc/authsvc / EXPOSE 8080 -ENTRYPOINT ["/authsvc"] +ENTRYPOINT ["/authsvc"] \ No newline at end of file diff --git a/images/fastcgi-helloserver/TAG b/images/fastcgi-helloserver/TAG index 90ab6e946e..8ce995b80e 100644 --- a/images/fastcgi-helloserver/TAG +++ b/images/fastcgi-helloserver/TAG @@ -1 +1 @@ -v0.0.2 \ No newline at end of file +v0.0.3 \ No newline at end of file diff --git a/images/fastcgi-helloserver/cloudbuild.yaml b/images/fastcgi-helloserver/cloudbuild.yaml index c1123a194e..e3ab3b3758 100644 --- a/images/fastcgi-helloserver/cloudbuild.yaml +++ b/images/fastcgi-helloserver/cloudbuild.yaml @@ -14,5 +14,4 @@ steps: - -c - | gcloud auth configure-docker \ - && cd images/ && make NAME=fastcgi-helloserver push - + && cd images/ && make NAME=fastcgi-helloserver push \ No newline at end of file diff --git a/images/fastcgi-helloserver/rootfs/Dockerfile b/images/fastcgi-helloserver/rootfs/Dockerfile index 38d7f8ce05..b7d24522d6 100755 --- a/images/fastcgi-helloserver/rootfs/Dockerfile +++ b/images/fastcgi-helloserver/rootfs/Dockerfile @@ -29,4 +29,4 @@ FROM gcr.io/distroless/static:nonroot COPY --from=builder /go/src/k8s.io/ingress-nginx/images/fastcgi/fastcgi-helloserver / USER nonroot:nonroot -CMD ["/fastcgi-helloserver"] +CMD ["/fastcgi-helloserver"] \ No newline at end of file diff --git a/images/go-grpc-greeter-server/TAG b/images/go-grpc-greeter-server/TAG index 90ab6e946e..8ce995b80e 100644 --- a/images/go-grpc-greeter-server/TAG +++ b/images/go-grpc-greeter-server/TAG @@ -1 +1 @@ -v0.0.2 \ No newline at end of file +v0.0.3 \ No newline at end of file diff --git a/images/go-grpc-greeter-server/cloudbuild.yaml b/images/go-grpc-greeter-server/cloudbuild.yaml index daef694164..b690ffbec0 100644 --- a/images/go-grpc-greeter-server/cloudbuild.yaml +++ b/images/go-grpc-greeter-server/cloudbuild.yaml @@ -16,4 +16,4 @@ steps: - -c - | gcloud auth configure-docker \ - && cd images/ && make NAME=go-grpc-greeter-server push + && cd images/ && make NAME=go-grpc-greeter-server push \ No newline at end of file diff --git a/images/go-grpc-greeter-server/rootfs/Dockerfile b/images/go-grpc-greeter-server/rootfs/Dockerfile index 94e4b91ff2..38fe73eb3f 100644 --- a/images/go-grpc-greeter-server/rootfs/Dockerfile +++ b/images/go-grpc-greeter-server/rootfs/Dockerfile @@ -13,4 +13,4 @@ COPY --from=build /greeter-server / EXPOSE 50051 -CMD ["/greeter-server"] +CMD ["/greeter-server"] \ No newline at end of file diff --git a/images/httpbun/TAG b/images/httpbun/TAG index 90ab6e946e..8ce995b80e 100644 --- a/images/httpbun/TAG +++ b/images/httpbun/TAG @@ -1 +1 @@ -v0.0.2 \ No newline at end of file +v0.0.3 \ No newline at end of file diff --git a/images/httpbun/cloudbuild.yaml b/images/httpbun/cloudbuild.yaml index bcf32db050..c532a3908f 100644 --- a/images/httpbun/cloudbuild.yaml +++ b/images/httpbun/cloudbuild.yaml @@ -16,4 +16,4 @@ steps: - -c - | gcloud auth configure-docker \ - && cd images/ && make NAME=httpbun push + && cd images/ && make NAME=httpbun push \ No newline at end of file diff --git a/images/httpbun/rootfs/Dockerfile b/images/httpbun/rootfs/Dockerfile index c4b1e6f9d3..7effc6ef51 100644 --- a/images/httpbun/rootfs/Dockerfile +++ b/images/httpbun/rootfs/Dockerfile @@ -31,4 +31,4 @@ FROM scratch COPY --from=builder /go/httpbun/bin/httpbun httpbun ENV HTTPBUN_BIND=0.0.0.0:80 EXPOSE 80 -ENTRYPOINT ["/httpbun"] +ENTRYPOINT ["/httpbun"] \ No newline at end of file