diff --git a/.deploy-infra/deploy-dev.yaml b/.deploy-infra/deploy-dev.yaml index b90fb77..952d48c 100644 --- a/.deploy-infra/deploy-dev.yaml +++ b/.deploy-infra/deploy-dev.yaml @@ -7,6 +7,7 @@ services: networks: - common-infra-nginx-development - configurator + - minio-development environment: MINIO_SECRET_KEY: $MINIO_SECRET_KEY_DEV ports: diff --git a/.deploy-infra/deploy-prod.yaml b/.deploy-infra/deploy-prod.yaml index 0d29c04..8cccb71 100755 --- a/.deploy-infra/deploy-prod.yaml +++ b/.deploy-infra/deploy-prod.yaml @@ -7,6 +7,7 @@ services: networks: - common-infra-nginx - configurator + - minio environment: MINIO_SECRET_KEY: $MINIO_SECRET_KEY_PROD ports: diff --git a/.deploy-portainer/deploy-prod.yaml b/.deploy-portainer/deploy-prod.yaml index a7234a1..c75293d 100644 --- a/.deploy-portainer/deploy-prod.yaml +++ b/.deploy-portainer/deploy-prod.yaml @@ -2,7 +2,7 @@ version: '3.2' services: agent: - image: portainer/agent:2.11.1 + image: portainer/agent:2.33.1 volumes: - /var/run/docker.sock:/var/run/docker.sock - /var/lib/docker/volumes:/var/lib/docker/volumes @@ -14,7 +14,7 @@ services: constraints: [node.platform.os == linux] portainer: - image: portainer/portainer-ce:2.11.1 + image: portainer/portainer-ce:2.33.1 command: -H tcp://tasks.agent:9001 --tlsskipverify ports: - "9443:9443" diff --git a/nginx/nginx-dev/prepare.py b/nginx/nginx-dev/prepare.py index 77e9572..37a903c 100644 --- a/nginx/nginx-dev/prepare.py +++ b/nginx/nginx-dev/prepare.py @@ -6,7 +6,7 @@ from json import loads minio_client = Minio( - "minio.dev.chocomarsh.com:9000", + "minio:9000", access_key="serviceminioadmin", secret_key=os.getenv("MINIO_SECRET_KEY", "minioadmin"), secure=False, diff --git a/nginx/nginx-prod/prepare.py b/nginx/nginx-prod/prepare.py index e15aa91..191218c 100644 --- a/nginx/nginx-prod/prepare.py +++ b/nginx/nginx-prod/prepare.py @@ -6,7 +6,7 @@ from json import loads minio_client = Minio( - "minio.chocomarsh.com:9000", + "minio:9000", access_key="serviceminioadmin", secret_key=os.getenv("MINIO_SECRET_KEY", "minioadmin"), secure=False,