diff --git a/.circleci/config.yml b/.circleci/config.yml index 0dba7d54a..ab006fc7d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -98,7 +98,7 @@ 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" @@ -106,7 +106,7 @@ executors: 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 diff --git a/dev-environments/camel-proxy/Makefile b/dev-environments/camel-proxy/Makefile index ae88a493b..eae7d89f8 100644 --- a/dev-environments/camel-proxy/Makefile +++ b/dev-environments/camel-proxy/Makefile @@ -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 diff --git a/dev-environments/camel-proxy/docker-compose.yml b/dev-environments/camel-proxy/docker-compose.yml index b1e78f153..fc87b5a53 100644 --- a/dev-environments/camel-proxy/docker-compose.yml +++ b/dev-environments/camel-proxy/docker-compose.yml @@ -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" @@ -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" diff --git a/dev-environments/grpc/docker-compose.yml b/dev-environments/grpc/docker-compose.yml index 6e2e62378..f374125f8 100644 --- a/dev-environments/grpc/docker-compose.yml +++ b/dev-environments/grpc/docker-compose.yml @@ -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: @@ -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" diff --git a/dev-environments/grpc/echoserver.Dockerfile b/dev-environments/grpc/echoserver.Dockerfile new file mode 100644 index 000000000..751501bed --- /dev/null +++ b/dev-environments/grpc/echoserver.Dockerfile @@ -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 diff --git a/dev-environments/http-proxy-plain-http-upstream/docker-compose.yml b/dev-environments/http-proxy-plain-http-upstream/docker-compose.yml index f1e461fba..ac8b8febe 100644 --- a/dev-environments/http-proxy-plain-http-upstream/docker-compose.yml +++ b/dev-environments/http-proxy-plain-http-upstream/docker-compose.yml @@ -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: @@ -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" diff --git a/dev-environments/http-proxy-plain-http-upstream/tinyproxy.Dockerfile b/dev-environments/http-proxy-plain-http-upstream/tinyproxy.Dockerfile index b8d4e49aa..baec01926 100644 --- a/dev-environments/http-proxy-plain-http-upstream/tinyproxy.Dockerfile +++ b/dev-environments/http-proxy-plain-http-upstream/tinyproxy.Dockerfile @@ -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" \ diff --git a/dev-environments/https-proxy-upstream-tlsv1.3/docker-compose.yml b/dev-environments/https-proxy-upstream-tlsv1.3/docker-compose.yml index 9fa735f7c..b7d67e6d9 100644 --- a/dev-environments/https-proxy-upstream-tlsv1.3/docker-compose.yml +++ b/dev-environments/https-proxy-upstream-tlsv1.3/docker-compose.yml @@ -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 expose: - - "80" + - "8080" diff --git a/dev-environments/https-proxy-upstream-tlsv1.3/tinyproxy.Dockerfile b/dev-environments/https-proxy-upstream-tlsv1.3/tinyproxy.Dockerfile index b8d4e49aa..438e1537f 100644 --- a/dev-environments/https-proxy-upstream-tlsv1.3/tinyproxy.Dockerfile +++ b/dev-environments/https-proxy-upstream-tlsv1.3/tinyproxy.Dockerfile @@ -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" \ diff --git a/dev-environments/keycloak-env/docker-compose.yml b/dev-environments/keycloak-env/docker-compose.yml index 3fdbd0114..e9e4a9cae 100644 --- a/dev-environments/keycloak-env/docker-compose.yml +++ b/dev-environments/keycloak-env/docker-compose.yml @@ -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 diff --git a/dev-environments/listen-tls/docker-compose.yml b/dev-environments/listen-tls/docker-compose.yml index 723f71886..e3f2ab6cd 100644 --- a/dev-environments/listen-tls/docker-compose.yml +++ b/dev-environments/listen-tls/docker-compose.yml @@ -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" diff --git a/dev-environments/opentelemetry-instrumented-gateway/docker-compose.yml b/dev-environments/opentelemetry-instrumented-gateway/docker-compose.yml index f9e3b760c..7ba3b0f9a 100644 --- a/dev-environments/opentelemetry-instrumented-gateway/docker-compose.yml +++ b/dev-environments/opentelemetry-instrumented-gateway/docker-compose.yml @@ -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" diff --git a/dev-environments/plain-http-upstream/docker-compose.yml b/dev-environments/plain-http-upstream/docker-compose.yml index 7e671800a..103c1f3bd 100644 --- a/dev-environments/plain-http-upstream/docker-compose.yml +++ b/dev-environments/plain-http-upstream/docker-compose.yml @@ -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" diff --git a/dev-environments/upstream-tlsv1.3/docker-compose.yml b/dev-environments/upstream-tlsv1.3/docker-compose.yml index 33061e8a8..eef81fe44 100644 --- a/dev-environments/upstream-tlsv1.3/docker-compose.yml +++ b/dev-environments/upstream-tlsv1.3/docker-compose.yml @@ -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" diff --git a/docker-compose-devel.yml b/docker-compose-devel.yml index f1f9e927f..4fbb8b142 100644 --- a/docker-compose-devel.yml +++ b/docker-compose-devel.yml @@ -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 diff --git a/docker-compose.benchmark.yml b/docker-compose.benchmark.yml index 0f54d3106..9441d0403 100644 --- a/docker-compose.benchmark.yml +++ b/docker-compose.benchmark.yml @@ -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: @@ -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: diff --git a/docker-compose.prove.yml b/docker-compose.prove.yml index 0afb77d32..f7b3c7475 100644 --- a/docker-compose.prove.yml +++ b/docker-compose.prove.yml @@ -10,4 +10,4 @@ services: depends_on: - redis redis: - image: redis + image: mirror.gcr.io/library/redis diff --git a/docker-compose.yml b/docker-compose.yml index 300f8c93f..53b55a537 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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" @@ -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"