self/infra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: self:624eddee2ab7822d2e85d7d62ae114f216ae728c
Branches Tags
self:master self:prod self:dev self:gitea-migration
...
compare: self:5d2c174fcea07cd7d7b82d79162a90fbed04ff0c
Branches Tags
self:prod self:master self:dev self:gitea-migration

3 Commits
624eddee2a ... 5d2c174fce

Author SHA1 Message Date
emmatveev
5d2c174fce Merge pull request 'master' (#146) from master into prod 
Reviewed-on: #146
 2025-09-15 10:10:37 +03:00
Egor Matveev
1347bcc321 fix
All checks were successful
Deploy Prod / Build (pull_request) Successful in 20s
Details
Deploy Prod / Push (pull_request) Successful in 17s
Details
Deploy Prod / prepare (pull_request) Successful in 6s
Details
Deploy Prod / Deploy prod (pull_request) Successful in 25s
Details
2025-09-15 10:10:00 +03:00
Egor Matveev
f6371f8813 fix
All checks were successful
Deploy Dev / Build (pull_request) Successful in 11s
Details
Deploy Dev / Push (pull_request) Successful in 15s
Details
Deploy Dev / prepare (pull_request) Successful in 4s
Details
Deploy Dev / Deploy dev (pull_request) Successful in 22s
Details
2025-09-15 01:39:13 +03:00
5 changed files with 6 additions and 4 deletions
Expand all files Collapse all files

1
.deploy-infra/deploy-dev.yaml
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:

1
.deploy-infra/deploy-prod.yaml
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:

4
.deploy-portainer/deploy-prod.yaml
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"

2
nginx/nginx-dev/prepare.py
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,

2
nginx/nginx-prod/prepare.py
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,