yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: update remaining docker images in workflows to use public.ecr.aws

This commit is contained in:
Ivan Dyachkov 2023-10-17 22:02:22 +02:00
parent fb6b02c1ea
commit 898279099b
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/docker-compose-file/docker-compose-pgsql-tls.yaml
View File

@ -8,7 +8,7 @@ services:
dockerfile: ./pgsql/Dockerfile dockerfile: ./pgsql/Dockerfile
args: args:
POSTGRES_USER: postgres POSTGRES_USER: postgres
BUILD_FROM: postgres:${PGSQL_TAG} BUILD_FROM: public.ecr.aws/docker/library/postgres:${PGSQL_TAG}
image: emqx_pgsql:${PGSQL_TAG} image: emqx_pgsql:${PGSQL_TAG}
restart: always restart: always
environment: environment:

3
.github/workflows/run_jmeter_tests.yaml vendored
View File

@ -118,7 +118,6 @@ jobs:
env: env:
PGSQL_TAG: ${{ matrix.pgsql_tag }} PGSQL_TAG: ${{ matrix.pgsql_tag }}
run: | run: |
docker pull postgres:${PGSQL_TAG}
docker compose \ docker compose \
-f .ci/docker-compose-file/docker-compose-emqx-cluster.yaml \ -f .ci/docker-compose-file/docker-compose-emqx-cluster.yaml \
-f .ci/docker-compose-file/docker-compose-pgsql-tls.yaml \ -f .ci/docker-compose-file/docker-compose-pgsql-tls.yaml \
@ -245,7 +244,7 @@ jobs:
cd scripts/jwks-server cd scripts/jwks-server
mvn package mvn package
cd target 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" -c "java -jar jwkserver-0.0.1.jar"
- name: run jmeter - name: run jmeter
run: | run: |

2
scripts/test/start-two-nodes-in-docker.sh
View File

@ -184,7 +184,7 @@ haproxy_cid=$(docker run -d --name haproxy \
-v "$(pwd)/apps/emqx/etc/certs:/usr/local/etc/haproxy/certs" \ -v "$(pwd)/apps/emqx/etc/certs:/usr/local/etc/haproxy/certs" \
-w /usr/local/etc/haproxy \ -w /usr/local/etc/haproxy \
"${HAPROXY_PORTS[@]}" \ "${HAPROXY_PORTS[@]}" \
"haproxy:2.4" \ "public.ecr.aws/docker/library/haproxy:2.4" \
bash -c 'set -euo pipefail; bash -c 'set -euo pipefail;
cat certs/cert.pem certs/key.pem > /tmp/emqx.pem; cat certs/cert.pem certs/key.pem > /tmp/emqx.pem;
haproxy -f haproxy.cfg') haproxy -f haproxy.cfg')