Merge remote-tracking branch 'origin/master' into release-53

.ci/docker-compose-file/.env

@@ -6,7 +6,7 @@ LDAP_TAG=2.4.50
 INFLUXDB_TAG=2.5.0
 TDENGINE_TAG=3.0.2.4
 DYNAMO_TAG=1.21.0
-CASSANDRA_TAG=3.11.6
+CASSANDRA_TAG=3.11
 MINIO_TAG=RELEASE.2023-03-20T20-16-18Z
 OPENTS_TAG=9aa7f88
 KINESIS_TAG=2.1

.ci/docker-compose-file/docker-compose-cassandra.yaml

@@ -2,7 +2,7 @@ version: '3.9'
 
 x-cassandra: &cassandra
   restart: always
-  image: cassandra:${CASSANDRA_TAG:-3.11.6}
+  image: public.ecr.aws/docker/library/cassandra:${CASSANDRA_TAG:-3.11}
   environment:
     CASSANDRA_BROADCAST_ADDRESS: "1.2.3.4"
     CASSANDRA_RPC_ADDRESS: "0.0.0.0"

.ci/docker-compose-file/docker-compose-dynamo.yaml

@@ -3,7 +3,7 @@ version: '3.9'
 services:
   dynamodb-local:
     container_name: dynamo 
-    image: amazon/dynamodb-local:${DYNAMO_TAG}
+    image: public.ecr.aws/aws-dynamodb-local/aws-dynamodb-local:${DYNAMO_TAG}
     restart: always
     ports:
       - "8000:8000"

.ci/docker-compose-file/docker-compose-emqx-cluster.yaml

@@ -13,7 +13,7 @@ x-default-emqx: &default-emqx
 services:
   haproxy:
     container_name: haproxy
-    image: haproxy:2.4
+    image: public.ecr.aws/docker/library/haproxy:2.4
     depends_on:
       - emqx1
       - emqx2

.ci/docker-compose-file/docker-compose-influxdb-tcp.yaml

@@ -3,7 +3,7 @@ version: '3.9'
 services:
   influxdb_server_tcp:
     container_name: influxdb_tcp
-    image: influxdb:${INFLUXDB_TAG}
+    image: public.ecr.aws/docker/library/influxdb:${INFLUXDB_TAG}
     expose:
       - "8086"
       - "8089/udp"

.ci/docker-compose-file/docker-compose-influxdb-tls.yaml

@@ -3,7 +3,7 @@ version: '3.9'
 services:
   influxdb_server_tls:
     container_name: influxdb_tls
-    image: influxdb:${INFLUXDB_TAG}
+    image: public.ecr.aws/docker/library/influxdb:${INFLUXDB_TAG}
     expose:
       - "8086"
       - "8089/udp"

.ci/docker-compose-file/docker-compose-kafka.yaml

@@ -2,7 +2,7 @@ version: '3.9'
 
 services:
   zookeeper:
-    image: docker.io/library/zookeeper:3.6
+    image: public.ecr.aws/docker/library/zookeeper:3.6
     ports:
       - "2181:2181"
     container_name: zookeeper

.ci/docker-compose-file/docker-compose-kinesis.yaml

@@ -3,7 +3,7 @@ version: '3.9'
 services:
   kinesis:
     container_name: kinesis
-    image: localstack/localstack:2.1
+    image: public.ecr.aws/localstack/localstack:2.1
     environment:
       - KINESIS_ERROR_PROBABILITY=0.0
       - KINESIS_LATENCY=0

.ci/docker-compose-file/docker-compose-mongo-replicaset-tcp.yaml

@@ -4,7 +4,7 @@ services:
   mongo1:
     hostname: mongo1
     container_name: mongo1
-    image: mongo:${MONGO_TAG}
+    image: public.ecr.aws/docker/library/mongo:${MONGO_TAG}
     environment:
       MONGO_INITDB_DATABASE: mqtt
     networks:
@@ -22,7 +22,7 @@ services:
   mongo2:
     hostname: mongo2
     container_name: mongo2
-    image: mongo:${MONGO_TAG}
+    image: public.ecr.aws/docker/library/mongo:${MONGO_TAG}
     environment:
       MONGO_INITDB_DATABASE: mqtt
     networks:
@@ -40,7 +40,7 @@ services:
   mongo3:
     hostname: mongo3
     container_name: mongo3
-    image: mongo:${MONGO_TAG}
+    image: public.ecr.aws/docker/library/mongo:${MONGO_TAG}
     environment:
       MONGO_INITDB_DATABASE: mqtt
     networks:
@@ -56,7 +56,7 @@ services:
       --replSet rs0
 
   mongo_rs_client:
-    image: mongo:${MONGO_TAG}
+    image: public.ecr.aws/docker/library/mongo:${MONGO_TAG}
     container_name: mongo_rs_client
     networks:
       - emqx_bridge

.ci/docker-compose-file/docker-compose-mongo-replicaset-tls.yaml

@@ -4,7 +4,7 @@ services:
   mongo1:
     hostname: mongo1
     container_name: mongo1
-    image: mongo:${MONGO_TAG}
+    image: public.ecr.aws/docker/library/mongo:${MONGO_TAG}
     environment:
       MONGO_INITDB_DATABASE: mqtt
     networks:
@@ -27,7 +27,7 @@ services:
   mongo2:
     hostname: mongo2
     container_name: mongo2
-    image: mongo:${MONGO_TAG}
+    image: public.ecr.aws/docker/library/mongo:${MONGO_TAG}
     environment:
       MONGO_INITDB_DATABASE: mqtt
     networks:
@@ -50,7 +50,7 @@ services:
   mongo3:
     hostname: mongo3
     container_name: mongo3
-    image: mongo:${MONGO_TAG}
+    image: public.ecr.aws/docker/library/mongo:${MONGO_TAG}
     environment:
       MONGO_INITDB_DATABASE: mqtt
     networks:
@@ -71,7 +71,7 @@ services:
         mongod --ipv6 --bind_ip_all --tlsMode requireTLS --tlsCertificateKeyFile /etc/certs/mongodb.pem --replSet rs0
       
   mongo_client:
-    image: mongo:${MONGO_TAG}
+    image: public.ecr.aws/docker/library/mongo:${MONGO_TAG}
     container_name: mongo_client
     networks:
       - emqx_bridge

.ci/docker-compose-file/docker-compose-mongo-sharded-tcp.yaml

@@ -4,7 +4,7 @@ services:
   mongosharded1:
     hostname: mongosharded1
     container_name: mongosharded1
-    image: mongo:${MONGO_TAG}
+    image: public.ecr.aws/docker/library/mongo:${MONGO_TAG}
     environment:
       MONGO_INITDB_DATABASE: mqtt
     networks:
@@ -24,7 +24,7 @@ services:
   mongosharded2:
     hostname: mongosharded2
     container_name: mongosharded2
-    image: mongo:${MONGO_TAG}
+    image: public.ecr.aws/docker/library/mongo:${MONGO_TAG}
     environment:
       MONGO_INITDB_DATABASE: mqtt
     networks:
@@ -44,7 +44,7 @@ services:
   mongosharded3:
     hostname: mongosharded3
     container_name: mongosharded3
-    image: mongo:${MONGO_TAG}
+    image: public.ecr.aws/docker/library/mongo:${MONGO_TAG}
     environment:
       MONGO_INITDB_DATABASE: mqtt
     networks:
@@ -62,7 +62,7 @@ services:
       --bind_ip_all
 
   mongosharded_client:
-    image: mongo:${MONGO_TAG}
+    image: public.ecr.aws/docker/library/mongo:${MONGO_TAG}
     container_name: mongosharded_client
     networks:
       - emqx_bridge

.ci/docker-compose-file/docker-compose-mongo-single-tcp.yaml

@@ -3,7 +3,7 @@ version: '3.9'
 services:
   mongo_server:
     container_name: mongo
-    image: mongo:${MONGO_TAG}
+    image: public.ecr.aws/docker/library/mongo:${MONGO_TAG}
     restart: always
     networks:
       - emqx_bridge

.ci/docker-compose-file/docker-compose-mongo-single-tls.yaml

@@ -3,7 +3,7 @@ version: '3.9'
 services:
   mongo_server_tls:
     container_name: mongo-tls
-    image: mongo:${MONGO_TAG}
+    image: public.ecr.aws/docker/library/mongo:${MONGO_TAG}
     restart: always
     environment:
       MONGO_INITDB_DATABASE: mqtt

.ci/docker-compose-file/docker-compose-mysql-tcp.yaml

@@ -3,7 +3,7 @@ version: '3.9'
 services:
   mysql_server:
     container_name: mysql
-    image: mysql:${MYSQL_TAG}
+    image: public.ecr.aws/docker/library/mysql:${MYSQL_TAG}
     restart: always
     ports:
       - "3306:3306"

.ci/docker-compose-file/docker-compose-mysql-tls.yaml

@@ -3,7 +3,7 @@ version: '3.9'
 services:
   mysql_server_tls:
     container_name: mysql-tls
-    image: mysql:${MYSQL_TAG}
+    image: public.ecr.aws/docker/library/mysql:${MYSQL_TAG}
     restart: always
     environment:
       MYSQL_ROOT_PASSWORD: public

.ci/docker-compose-file/docker-compose-pgsql-tcp.yaml

@@ -3,7 +3,7 @@ version: '3.9'
 services:
   pgsql_server:
     container_name: pgsql
-    image: postgres:${PGSQL_TAG}
+    image: public.ecr.aws/docker/library/postgres:${PGSQL_TAG}
     restart: always
     environment:
       POSTGRES_PASSWORD: public

.ci/docker-compose-file/docker-compose-python.yaml

@@ -3,7 +3,7 @@ version: '3.9'
 services:
   python:
     container_name: python
-    image: python:3.9.16-alpine3.18
+    image: public.ecr.aws/docker/library/python:3.9.16-alpine3.18
     depends_on:
       - emqx1
       - emqx2

.ci/docker-compose-file/docker-compose-rabbitmq.yaml

@@ -3,7 +3,7 @@ version: '3.9'
 services:
   rabbitmq:
     container_name: rabbitmq
-    image: rabbitmq:3.11-management
+    image: public.ecr.aws/docker/library/rabbitmq:3.11-management
 
     restart: always
     expose:

.ci/docker-compose-file/docker-compose-redis-cluster-tcp.yaml

@@ -3,7 +3,7 @@ services:
 
   redis-cluster-1: &redis-node
     container_name: redis-cluster-1
-    image: redis:${REDIS_TAG}
+    image: public.ecr.aws/docker/library/redis:${REDIS_TAG}
     volumes:
     - ./redis/cluster-tcp:/usr/local/etc/redis
     command: redis-server /usr/local/etc/redis/redis.conf

.ci/docker-compose-file/docker-compose-redis-cluster-tls.yaml

@@ -3,7 +3,7 @@ services:
 
   redis-cluster-tls-1: &redis-node
     container_name: redis-cluster-tls-1
-    image: redis:${REDIS_TAG}
+    image: public.ecr.aws/docker/library/redis:${REDIS_TAG}
     volumes:
     - ./redis/cluster-tls:/usr/local/etc/redis
     - ../../apps/emqx/etc/certs:/etc/certs

.ci/docker-compose-file/docker-compose-redis-sentinel-tcp.yaml

@@ -4,7 +4,7 @@ services:
 
   redis-sentinel-master:
     container_name: redis-sentinel-master
-    image: redis:${REDIS_TAG}
+    image: public.ecr.aws/docker/library/redis:${REDIS_TAG}
     volumes:
     - ./redis/sentinel-tcp:/usr/local/etc/redis
     command: redis-server /usr/local/etc/redis/master.conf
@@ -13,7 +13,7 @@ services:
 
   redis-sentinel-slave:
     container_name: redis-sentinel-slave
-    image: redis:${REDIS_TAG}
+    image: public.ecr.aws/docker/library/redis:${REDIS_TAG}
     volumes:
       - ./redis/sentinel-tcp:/usr/local/etc/redis
     command: redis-server /usr/local/etc/redis/slave.conf
@@ -24,7 +24,7 @@ services:
 
   redis-sentinel:
     container_name: redis-sentinel
-    image: redis:${REDIS_TAG}
+    image: public.ecr.aws/docker/library/redis:${REDIS_TAG}
     volumes:
       - ./redis/sentinel-tcp/sentinel-base.conf:/usr/local/etc/redis/sentinel-base.conf
     depends_on:

.ci/docker-compose-file/docker-compose-redis-sentinel-tls.yaml

@@ -4,7 +4,7 @@ services:
 
   redis-sentinel-tls-master:
     container_name: redis-sentinel-tls-master
-    image: redis:${REDIS_TAG}
+    image: public.ecr.aws/docker/library/redis:${REDIS_TAG}
     volumes:
       - ./redis/sentinel-tls:/usr/local/etc/redis
       - ../../apps/emqx/etc/certs:/etc/certs
@@ -14,7 +14,7 @@ services:
 
   redis-sentinel-tls-slave:
     container_name: redis-sentinel-tls-slave
-    image: redis:${REDIS_TAG}
+    image: public.ecr.aws/docker/library/redis:${REDIS_TAG}
     volumes:
       - ./redis/sentinel-tls:/usr/local/etc/redis
       - ../../apps/emqx/etc/certs:/etc/certs
@@ -26,7 +26,7 @@ services:
 
   redis-sentinel-tls:
     container_name: redis-sentinel-tls
-    image: redis:${REDIS_TAG}
+    image: public.ecr.aws/docker/library/redis:${REDIS_TAG}
     volumes:
       - ./redis/sentinel-tls/sentinel-base.conf:/usr/local/etc/redis/sentinel-base.conf
       - ../../apps/emqx/etc/certs:/etc/certs

.ci/docker-compose-file/docker-compose-redis-single-tcp.yaml

@@ -3,7 +3,7 @@ version: '3.9'
 services:
   redis_server:
     container_name: redis
-    image: redis:${REDIS_TAG}
+    image: public.ecr.aws/docker/library/redis:${REDIS_TAG}
     volumes:
       - ./redis/single-tcp:/usr/local/etc/redis/
     ports:

.ci/docker-compose-file/docker-compose-redis-single-tls.yaml

@@ -3,7 +3,7 @@ version: '3.9'
 services:
   redis_server_tls:
     container_name: redis-tls
-    image: redis:${REDIS_TAG}
+    image: public.ecr.aws/docker/library/redis:${REDIS_TAG}
     volumes:
       - ./certs/server.crt:/etc/certs/redis.crt
       - ./certs/server.key:/etc/certs/redis.key

.ci/docker-compose-file/pgsql/Dockerfile

@@ -1,4 +1,4 @@
-ARG BUILD_FROM=postgres:13
+ARG BUILD_FROM=public.ecr.aws/docker/library/postgres:13
 FROM ${BUILD_FROM}
 ARG POSTGRES_USER=postgres
 COPY --chown=$POSTGRES_USER ./pgsql/pg_hba_tls.conf /var/lib/postgresql/pg_hba.conf