Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use dockerhub for e2e and demo images #10851

Merged
merged 1 commit into from
Jan 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .github/workflows/images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ jobs:
uses: ./.github/workflows/zz-tmpl-images.yaml
with:
name: cfssl
secrets: inherit

custom-error-pages:
needs: changes
Expand All @@ -80,6 +81,8 @@ jobs:
uses: ./.github/workflows/zz-tmpl-images.yaml
with:
name: custom-error-pages
secrets: inherit


e2e-test-echo:
needs: changes
Expand All @@ -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
Expand All @@ -96,6 +100,7 @@ jobs:
uses: ./.github/workflows/zz-tmpl-images.yaml
with:
name: ext-auth-example-authsvc
secrets: inherit

fastcgi-helloserver:
needs: changes
Expand All @@ -104,6 +109,7 @@ jobs:
uses: ./.github/workflows/zz-tmpl-images.yaml
with:
name: fastcgi-helloserver
secrets: inherit

go-grpc-greeter-server:
needs: changes
Expand All @@ -112,6 +118,7 @@ jobs:
uses: ./.github/workflows/zz-tmpl-images.yaml
with:
name: go-grpc-greeter-server
secrets: inherit

httpbun:
needs: changes
Expand All @@ -120,6 +127,7 @@ jobs:
uses: ./.github/workflows/zz-tmpl-images.yaml
with:
name: httpbun
secrets: inherit

kube-webhook-certgen:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion images/cfssl/TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.0.2
v0.0.3
2 changes: 1 addition & 1 deletion images/cfssl/rootfs/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ RUN apk update \

EXPOSE 8888

CMD ["cfssl"]
CMD ["cfssl"]
2 changes: 1 addition & 1 deletion images/custom-error-pages/TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.0.2
v0.0.3
2 changes: 1 addition & 1 deletion images/custom-error-pages/rootfs/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
2 changes: 1 addition & 1 deletion images/e2e-test-echo/TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.0.2
v0.0.3
2 changes: 1 addition & 1 deletion images/e2e-test-echo/rootfs/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion images/ext-auth-example-authsvc/TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.0.2
v0.0.3
2 changes: 1 addition & 1 deletion images/ext-auth-example-authsvc/cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion images/ext-auth-example-authsvc/rootfs/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
2 changes: 1 addition & 1 deletion images/fastcgi-helloserver/TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.0.2
v0.0.3
3 changes: 1 addition & 2 deletions images/fastcgi-helloserver/cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@ steps:
- -c
- |
gcloud auth configure-docker \
&& cd images/ && make NAME=fastcgi-helloserver push

&& cd images/ && make NAME=fastcgi-helloserver push
2 changes: 1 addition & 1 deletion images/fastcgi-helloserver/rootfs/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
2 changes: 1 addition & 1 deletion images/go-grpc-greeter-server/TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.0.2
v0.0.3
2 changes: 1 addition & 1 deletion images/go-grpc-greeter-server/cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion images/go-grpc-greeter-server/rootfs/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ COPY --from=build /greeter-server /

EXPOSE 50051

CMD ["/greeter-server"]
CMD ["/greeter-server"]
2 changes: 1 addition & 1 deletion images/httpbun/TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.0.2
v0.0.3
2 changes: 1 addition & 1 deletion images/httpbun/cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ steps:
- -c
- |
gcloud auth configure-docker \
&& cd images/ && make NAME=httpbun push
&& cd images/ && make NAME=httpbun push
2 changes: 1 addition & 1 deletion images/httpbun/rootfs/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"]