master #146

Merged
emmatveev merged 2 commits from master into prod 2025-09-15 10:10:39 +03:00
5 changed files with 6 additions and 4 deletions

View File

@ -7,6 +7,7 @@ services:
networks: networks:
- common-infra-nginx-development - common-infra-nginx-development
- configurator - configurator
- minio-development
environment: environment:
MINIO_SECRET_KEY: $MINIO_SECRET_KEY_DEV MINIO_SECRET_KEY: $MINIO_SECRET_KEY_DEV
ports: ports:

View File

@ -7,6 +7,7 @@ services:
networks: networks:
- common-infra-nginx - common-infra-nginx
- configurator - configurator
- minio
environment: environment:
MINIO_SECRET_KEY: $MINIO_SECRET_KEY_PROD MINIO_SECRET_KEY: $MINIO_SECRET_KEY_PROD
ports: ports:

View File

@ -2,7 +2,7 @@ version: '3.2'
services: services:
agent: agent:
image: portainer/agent:2.11.1 image: portainer/agent:2.33.1
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
- /var/lib/docker/volumes:/var/lib/docker/volumes - /var/lib/docker/volumes:/var/lib/docker/volumes
@ -14,7 +14,7 @@ services:
constraints: [node.platform.os == linux] constraints: [node.platform.os == linux]
portainer: portainer:
image: portainer/portainer-ce:2.11.1 image: portainer/portainer-ce:2.33.1
command: -H tcp://tasks.agent:9001 --tlsskipverify command: -H tcp://tasks.agent:9001 --tlsskipverify
ports: ports:
- "9443:9443" - "9443:9443"

View File

@ -6,7 +6,7 @@ from json import loads
minio_client = Minio( minio_client = Minio(
"minio.dev.chocomarsh.com:9000", "minio:9000",
access_key="serviceminioadmin", access_key="serviceminioadmin",
secret_key=os.getenv("MINIO_SECRET_KEY", "minioadmin"), secret_key=os.getenv("MINIO_SECRET_KEY", "minioadmin"),
secure=False, secure=False,

View File

@ -6,7 +6,7 @@ from json import loads
minio_client = Minio( minio_client = Minio(
"minio.chocomarsh.com:9000", "minio:9000",
access_key="serviceminioadmin", access_key="serviceminioadmin",
secret_key=os.getenv("MINIO_SECRET_KEY", "minioadmin"), secret_key=os.getenv("MINIO_SECRET_KEY", "minioadmin"),
secure=False, secure=False,