diff --git a/.ci/docker-compose-file/docker-compose-pgsql-tls.yaml b/.ci/docker-compose-file/docker-compose-pgsql-tls.yaml index d2eaaaf07..5ba7df0be 100644 --- a/.ci/docker-compose-file/docker-compose-pgsql-tls.yaml +++ b/.ci/docker-compose-file/docker-compose-pgsql-tls.yaml @@ -8,7 +8,7 @@ services: dockerfile: ./pgsql/Dockerfile args: POSTGRES_USER: postgres - BUILD_FROM: postgres:${PGSQL_TAG} + BUILD_FROM: public.ecr.aws/docker/library/postgres:${PGSQL_TAG} image: emqx_pgsql:${PGSQL_TAG} restart: always environment: diff --git a/.github/workflows/run_jmeter_tests.yaml b/.github/workflows/run_jmeter_tests.yaml index 18fc226a6..c2a42d951 100644 --- a/.github/workflows/run_jmeter_tests.yaml +++ b/.github/workflows/run_jmeter_tests.yaml @@ -118,7 +118,6 @@ jobs: env: PGSQL_TAG: ${{ matrix.pgsql_tag }} run: | - docker pull postgres:${PGSQL_TAG} docker compose \ -f .ci/docker-compose-file/docker-compose-emqx-cluster.yaml \ -f .ci/docker-compose-file/docker-compose-pgsql-tls.yaml \ @@ -245,7 +244,7 @@ jobs: cd scripts/jwks-server mvn package cd target - docker run --name jwks_server --network emqx_bridge --ip 172.100.239.88 -d -v $(pwd)/jwkserver-0.0.1.jar:/jwks_server/jwkserver-0.0.1.jar --workdir /jwks_server openjdk:8-jdk bash \ + docker run --name jwks_server --network emqx_bridge --ip 172.100.239.88 -d -v $(pwd)/jwkserver-0.0.1.jar:/jwks_server/jwkserver-0.0.1.jar --workdir /jwks_server public.ecr.aws/amazoncorretto/amazoncorretto:8 bash \ -c "java -jar jwkserver-0.0.1.jar" - name: run jmeter run: | diff --git a/scripts/test/start-two-nodes-in-docker.sh b/scripts/test/start-two-nodes-in-docker.sh index a6fe4d522..b3a20982a 100755 --- a/scripts/test/start-two-nodes-in-docker.sh +++ b/scripts/test/start-two-nodes-in-docker.sh @@ -184,7 +184,7 @@ haproxy_cid=$(docker run -d --name haproxy \ -v "$(pwd)/apps/emqx/etc/certs:/usr/local/etc/haproxy/certs" \ -w /usr/local/etc/haproxy \ "${HAPROXY_PORTS[@]}" \ - "haproxy:2.4" \ + "public.ecr.aws/docker/library/haproxy:2.4" \ bash -c 'set -euo pipefail; cat certs/cert.pem certs/key.pem > /tmp/emqx.pem; haproxy -f haproxy.cfg')