diff --git a/deploy/docker-compose-CeleryExecutor.yml b/deploy/docker-compose-CeleryExecutor.yml index 15a636aa..27be7664 100644 --- a/deploy/docker-compose-CeleryExecutor.yml +++ b/deploy/docker-compose-CeleryExecutor.yml @@ -40,7 +40,7 @@ volumes: services: rabbitmq: - image: rabbitmq:3.10-management + image: rabbitmq:3.12-management restart: always environment: - RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS=-rabbit heartbeat 600 consumer_timeout 2592000000 @@ -55,7 +55,7 @@ services: retries: 5 postgres: - image: postgres:13-alpine + image: postgres:15-alpine restart: always environment: - POSTGRES_USER @@ -70,13 +70,14 @@ services: retries: 5 pgbouncer: - image: ranlu/pgbouncer:1.17.0 + image: ranlu/pgbouncer:1.22.0 restart: always environment: - DB_USER=${POSTGRES_USER} - DB_PASSWORD=${POSTGRES_PASSWORD} - DB_NAME=${POSTGRES_DB} - DB_HOST=postgres + - AUTH_TYPE=scram-sha-256 - MAX_CLIENT_CONN=10000 - DEFAULT_POOL_SIZE=${POSTGRES_MAX_CONN} - POOL_MODE=transaction diff --git a/docker/Dockerfile b/docker/Dockerfile index 2c16f840..1a833ee5 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -15,7 +15,7 @@ ARG AIRFLOW_HOME=/usr/local/airflow ENV AIRFLOW_HOME ${AIRFLOW_HOME} ARG AIRFLOW_USER=airflow ENV AIRFLOW_USER ${AIRFLOW_USER} -ARG AIRFLOW_VERSION=2.8.0 +ARG AIRFLOW_VERSION=2.8.1 ENV AIRFLOW_VERSION ${AIRFLOW_VERSION} ARG MINICONDA_PATH=/opt/conda ARG MINICONDA_URL=https://github.com/conda-forge/miniforge/releases/latest/download/Miniforge3-Linux-x86_64.sh @@ -34,7 +34,7 @@ RUN savedAptMark="$(apt-mark showmanual)" \ && rm ~/miniconda.sh \ && conda update conda \ && conda install -y nomkl \ - && conda install -y -c conda-forge numpy=1.24.4 scipy cryptography=41.0.7 redis-py boto3=1.33.13 botocore=1.33.13 celery=5.3.6 networkx gevent pillow matplotlib-base kombu=5.3.4 pysimdjson zstandard zfpy \ + && conda install -y -c conda-forge -c main numpy=1.24.4 scipy cryptography=41.0.7 redis-py boto3=1.33.13 botocore=1.33.13 celery=5.3.6 networkx=3.2.1 gevent=23.9.1 pillow matplotlib-base kombu=5.3.5 pysimdjson zstandard=0.22.0 zfpy \ && find ${MINICONDA_PATH} -follow -type f -name '*.a' -delete \ && find ${MINICONDA_PATH} -follow -type f -name '*.js.map' -delete \ && conda clean -yaf \