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

Move base image to registry and remove docker hub images (2.15) #1517

Merged
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
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,15 @@ executors:
docker:
working_directory: /opt/app-root/apicast
docker:
- image: docker:23.0.2-cli-alpine3.17
- image: mirror.gcr.io/library/docker:23.0.2-cli-alpine3.17
environment:
COMPOSE_TLS_VERSION: "TLSv1_2"

openresty:
working_directory: /opt/app-root/apicast
docker:
- image: quay.io/3scale/apicast-ci:openresty-1.19.3-23
- image: redis:3.2.8-alpine
- image: mirror.gcr.io/library/redis:3.2.8-alpine
environment:
TEST_NGINX_BINARY: openresty
LUA_BIN_PATH: /opt/app-root/bin
Expand Down
4 changes: 2 additions & 2 deletions dev-environments/camel-proxy/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ $(WORKDIR)/cert/keystore.jks: ## use same JVM version as camel-netty-proxy, curr
$(DOCKER) run -t --rm \
-v $(WORKDIR)/cert:/tmp/cert \
--user $(USER):$(GROUP) \
openjdk:11.0.9 \
registry.access.redhat.com/ubi8/openjdk-11:1.21-1.1733300800 \
keytool -genkeypair -keystore /tmp/cert/keystore.jks -dname "CN=tls.camel.proxy" -keypass changeit -storepass changeit -alias camel -keyalg RSA -ext SAN=dns:tls.camel.proxy
$(DOCKER) run -t --rm \
-v $(WORKDIR)/cert:/tmp/cert \
--user $(USER):$(GROUP) \
openjdk:11.0.9 \
registry.access.redhat.com/ubi8/openjdk-11:1.21-1.1733300800 \
keytool -list -v -keystore /tmp/cert/keystore.jks -storepass changeit

.PHONY: certs
Expand Down
12 changes: 6 additions & 6 deletions dev-environments/camel-proxy/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ services:
volumes:
- ./apicast-config.json:/tmp/config.json
proxy.socat:
image: alpine/socat:1.7.4.4
image: quay.io/openshift-logging/alpine-socat:1.8.0.0
container_name: proxy
restart: unless-stopped
command: "-d -v -d TCP-LISTEN:8080,reuseaddr,fork TCP:camel.proxy:8080"
camel.proxy:
image: zregvart/camel-netty-proxy
image: quay.io/zregvart/camel-netty-proxy
container_name: camel.proxy
expose:
- "8080:8080"
Expand All @@ -48,14 +48,14 @@ services:
volumes:
- ./cert/keystore.jks:/tls/keystore.jks
example.com:
image: alpine/socat:1.7.4.4
image: quay.io/openshift-logging/alpine-socat:1.8.0.0
container_name: example.com
command: "-d -v -d TCP-LISTEN:80,reuseaddr,fork TCP:actual.upstream:80"
command: "-d -v -d TCP-LISTEN:80,reuseaddr,fork TCP:actual.upstream:8080"
expose:
- "443"
restart: unless-stopped
actual.upstream:
image: kennethreitz/httpbin
image: quay.io/kuadrant/authorino-examples:talker-api
container_name: actual.upstream
expose:
- "80"
- "8080"
6 changes: 4 additions & 2 deletions dev-environments/grpc/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ services:
- ./apicast-config.json:/tmp/config.json
- ./gateway-cert:/var/run/secrets/apicast
one.upstream:
image: alpine/socat:1.7.4.4
image: quay.io/openshift-logging/alpine-socat:1.8.0.0
container_name: one.upstream
command: "-v openssl-listen:443,reuseaddr,fork,cert=/etc/pki/upstream.example.com.pem,verify=0,openssl-max-proto-version=TLS1.3 ssl:two.upstream:8005,verify=0"
expose:
Expand All @@ -35,6 +35,8 @@ services:
volumes:
- ./upstream-cert/upstream.example.com.pem:/etc/pki/upstream.example.com.pem
two.upstream:
image: kalmhq/echoserver
container_name: two.upstream
build:
dockerfile: ./echoserver.Dockerfile
expose:
- "8005"
23 changes: 23 additions & 0 deletions dev-environments/grpc/echoserver.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
FROM registry.access.redhat.com/ubi8/go-toolset:1.13.4 as builder

WORKDIR /workspace

RUN cd /tmp \
&& curl -fSL https://github.com/kalmhq/echoserver/archive/refs/tags/v0.1.1.tar.gz -o echoserver-v0.1.1.tar.gz \
&& tar xzf echoserver-v0.1.1.tar.gz \
&& cd echoserver-0.1.1 \
&& go mod download \
&& GOOS=linux GOARCH=amd64 go build -ldflags "-s -w" -o server . \
&& cp server /workspace \
&& cp default.key /workspace \
&& cp default.pem /workspace

FROM mirror.gcr.io/library/alpine
RUN apk update && apk add --no-cache curl
WORKDIR /workspace
# Collect binaries and assets
RUN mkdir /lib64 && ln -s /lib/libc.musl-x86_64.so.1 /lib64/ld-linux-x86-64.so.2
COPY --from=builder /workspace/server .
COPY --from=builder /workspace/default.key .
COPY --from=builder /workspace/default.pem .
CMD /workspace/server
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ services:
volumes:
- ./apicast-config.json:/tmp/config.json
proxy:
image: alpine/socat:1.7.4.4
image: quay.io/openshift-logging/alpine-socat:1.8.0.0
container_name: proxy
command: "-d -v -d TCP-LISTEN:8080,reuseaddr,fork TCP:actual.proxy:443"
expose:
Expand All @@ -40,13 +40,13 @@ services:
volumes:
- ./tinyproxy.conf:/etc/tinyproxy/tinyproxy.conf
example.com:
image: alpine/socat:1.7.4.4
image: quay.io/openshift-logging/alpine-socat:1.8.0.0
container_name: example.com
command: "-d -v -d TCP-LISTEN:80,reuseaddr,fork TCP:two.upstream:80"
command: "-d -v -d TCP-LISTEN:80,reuseaddr,fork TCP:two.upstream:8080"
expose:
- "443"
restart: unless-stopped
two.upstream:
image: kennethreitz/httpbin
image: quay.io/kuadrant/authorino-examples:talker-api
expose:
- "80"
- "8080"
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.17.3
FROM mirror.gcr.io/library/alpine:3

LABEL summary="Forward proxy based on tinyproxy for development purposes" \
description="Forward proxy based on tinyproxy for development purposes" \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ services:
volumes:
- ./tinyproxy.conf:/etc/tinyproxy/tinyproxy.conf
example.com:
image: alpine/socat:1.7.4.4
image: quay.io/openshift-logging/alpine-socat:1.8.0.0
container_name: example.com
command: "-v openssl-listen:443,reuseaddr,fork,cert=/etc/pki/example.com.pem,verify=0,openssl-min-proto-version=TLS1.3,openssl-max-proto-version=TLS1.3 TCP:two.upstream:80"
command: "-v openssl-listen:443,reuseaddr,fork,cert=/etc/pki/example.com.pem,verify=0,openssl-min-proto-version=TLS1.3,openssl-max-proto-version=TLS1.3 TCP:two.upstream:8080"
expose:
- "443"
restart: unless-stopped
volumes:
- ./cert/example.com.pem:/etc/pki/example.com.pem
two.upstream:
image: kennethreitz/httpbin
image: quay.io/kuadrant/authorino-examples:talker-api
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is ok, since httpbin is more restrictive in accepted paths, like /get for GET requests.

expose:
- "80"
- "8080"
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.17.3
FROM mirror.gcr.io/library/alpine:3.17.3

LABEL summary="Forward proxy based on tinyproxy for development purposes" \
description="Forward proxy based on tinyproxy for development purposes" \
Expand Down
8 changes: 4 additions & 4 deletions dev-environments/keycloak-env/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ services:
volumes:
- ./apicast-config.json:/tmp/config.json
example.com:
image: alpine/socat:1.7.4.4
image: quay.io/openshift-logging/alpine-socat:1.8.0.0
container_name: example.com
command: "-d -v -d TCP-LISTEN:80,reuseaddr,fork TCP:two.upstream:80"
command: "-d -v -d TCP-LISTEN:80,reuseaddr,fork TCP:two.upstream:8080"
expose:
- "80"
restart: unless-stopped
two.upstream:
image: kennethreitz/httpbin
image: quay.io/kuadrant/authorino-examples:talker-api
expose:
- "80"
- "8080"
keycloak:
image: quay.io/keycloak/keycloak:23.0.4
container_name: keycloak
Expand Down
8 changes: 4 additions & 4 deletions dev-environments/listen-tls/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ services:
- ./apicast-config.json:/tmp/config.json
- ./cert:/var/run/secrets/apicast
one.upstream:
image: alpine/socat:1.7.4.4
image: quay.io/openshift-logging/alpine-socat:1.8.0.0
container_name: one.upstream
command: "-d -v -d TCP-LISTEN:80,reuseaddr,fork TCP:two.upstream:80"
command: "-d -v -d TCP-LISTEN:80,reuseaddr,fork TCP:two.upstream:8080"
expose:
- "80"
restart: unless-stopped
two.upstream:
image: kennethreitz/httpbin
image: quay.io/kuadrant/authorino-examples:talker-api
expose:
- "80"
- "8080"
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,18 @@ services:
- ./apicast-config.json:/tmp/config.json
- ./otel.toml:/opt/app-root/src/tracing-configs/otel.toml
example.com:
image: alpine/socat:1.7.4.4
image: quay.io/openshift-logging/alpine-socat:1.8.0.0
container_name: example.com
command: "-d -v -d TCP-LISTEN:80,reuseaddr,fork TCP:two.upstream:80"
command: "-d -v -d TCP-LISTEN:80,reuseaddr,fork TCP:two.upstream:8080"
expose:
- "80"
restart: unless-stopped
two.upstream:
image: kennethreitz/httpbin
image: quay.io/kuadrant/authorino-examples:talker-api
expose:
- "80"
- "8080"
jaeger:
image: jaegertracing/all-in-one:latest
image: quay.io/ducna/jaegertracing/all-in-one:1.60
environment:
JAEGER_DISABLED: "false"
COLLECTOR_OTLP_ENABLED: "true"
Expand Down
8 changes: 4 additions & 4 deletions dev-environments/plain-http-upstream/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ services:
volumes:
- ./apicast-config.json:/tmp/config.json
example.com:
image: alpine/socat:1.7.4.4
image: quay.io/openshift-logging/alpine-socat:1.8.0.0
container_name: example.com
command: "-d -v -d TCP-LISTEN:80,reuseaddr,fork TCP:two.upstream:80"
command: "-d -v -d TCP-LISTEN:80,reuseaddr,fork TCP:two.upstream:8080"
expose:
- "80"
restart: unless-stopped
two.upstream:
image: kennethreitz/httpbin
image: quay.io/kuadrant/authorino-examples:talker-api
expose:
- "80"
- "8080"
8 changes: 4 additions & 4 deletions dev-environments/upstream-tlsv1.3/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ services:
volumes:
- ./apicast-config.json:/tmp/config.json
example.com:
image: alpine/socat:1.7.4.4
image: quay.io/openshift-logging/alpine-socat:1.8.0.0
container_name: example.com
command: "-v openssl-listen:443,reuseaddr,fork,cert=/etc/pki/example.com.pem,verify=0,openssl-min-proto-version=TLS1.3,openssl-max-proto-version=TLS1.3 TCP:two.upstream:80"
command: "-v openssl-listen:443,reuseaddr,fork,cert=/etc/pki/example.com.pem,verify=0,openssl-min-proto-version=TLS1.3,openssl-max-proto-version=TLS1.3 TCP:two.upstream:8080"
expose:
- "443"
restart: unless-stopped
volumes:
- ./cert/example.com.pem:/etc/pki/example.com.pem
two.upstream:
image: kennethreitz/httpbin
image: quay.io/kuadrant/authorino-examples:talker-api
expose:
- "80"
- "8080"
2 changes: 1 addition & 1 deletion docker-compose-devel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ services:
GIT_COMMITTER_NAME: ${GIT_COMMITTER_NAME:-${USER}}
GIT_COMMITTER_EMAIL: ${GIT_COMMITTER_EMAIL:-""}
redis:
image: redis
image: mirror.gcr.io/library/redis
4 changes: 2 additions & 2 deletions docker-compose.benchmark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
cpuset: "0"
cpu_count: 1
wrk:
image: skandyla/wrk
image: quay.io/skupper/wrk
environment:
- WRK_REPORT=/tmp/wrk/${WRK_REPORT:-report.csv}
depends_on:
Expand All @@ -23,7 +23,7 @@ services:
command: "--script /tmp/wrk/report.lua --threads ${THREADS:-10} --connections ${CONNECTIONS:-100} --duration ${DURATION:-60} -H 'Host: localhost' http://apicast:8080/echo?user_key=foo"

curl:
image: byrnedo/alpine-curl
image: quay.io/curl/curl
links:
- apicast
depends_on:
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.prove.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ services:
depends_on:
- redis
redis:
image: redis
image: mirror.gcr.io/library/redis
10 changes: 5 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ services:
dns_search:
- example.com
redis:
image: redis
image: mirror.gcr.io/library/redis
keycloak:
image: jboss/keycloak:3.1.0.Final
image: quay.io/keycloak/keycloak:23.0.4
environment:
KEYCLOAK_USER: keycloak
KEYCLOAK_PASSWORD: keycloak
KEYCLOAK_ADMIN: keycloak
KEYCLOAK_ADMIN_PASSWORD: keycloak
KEYCLOAK_LOGLEVEL: INFO
ports:
- "8080"
Expand All @@ -70,7 +70,7 @@ services:
- ./examples/opentracing/apicast-config.json:/tmp/config.json
- ./examples/opentracing/jaeger-config.json:/opt/app-root/src/tracing-configs/tracing-config-jaeger-jaeger-config.json
jaeger:
image: jaegertracing/all-in-one:latest
image: quay.io/ducna/jaegertracing/all-in-one:1.60
environment:
JAEGER_DISABLED: "false"
COLLECTOR_OTLP_ENABLED: "true"
Expand Down