Compare commits
6 Commits
62e301ec5b
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7795898546 | ||
|
|
d8c68a2307 | ||
| e706e91a2a | |||
| b0b3dbdbd6 | |||
|
|
1347bcc321 | ||
|
|
f6371f8813 |
@@ -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:
|
||||||
|
|||||||
@@ -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:
|
||||||
@@ -177,7 +178,9 @@ services:
|
|||||||
order: start-first
|
order: start-first
|
||||||
|
|
||||||
gitea:
|
gitea:
|
||||||
image: gitea/gitea:1.22.3
|
image: gitea/gitea:1.24.6
|
||||||
|
networks:
|
||||||
|
- postgres
|
||||||
volumes:
|
volumes:
|
||||||
- /sprint-data/gitea:/data
|
- /sprint-data/gitea:/data
|
||||||
- /etc/timezone:/etc/timezone
|
- /etc/timezone:/etc/timezone
|
||||||
@@ -189,7 +192,7 @@ services:
|
|||||||
USER_UID: 1000
|
USER_UID: 1000
|
||||||
USER_GID: 1000
|
USER_GID: 1000
|
||||||
GITEA__database__DB_TYPE: postgres
|
GITEA__database__DB_TYPE: postgres
|
||||||
GITEA__database__HOST: pg.chocomarsh.com:5432
|
GITEA__database__HOST: postgres:5432
|
||||||
GITEA__database__NAME: gitea
|
GITEA__database__NAME: gitea
|
||||||
GITEA__database__USER: postgres
|
GITEA__database__USER: postgres
|
||||||
GITEA__database__PASSWD: $DB_PASSWORD_PROD
|
GITEA__database__PASSWD: $DB_PASSWORD_PROD
|
||||||
@@ -208,6 +211,7 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- /var/run/docker.sock:/var/run/docker.sock
|
- /var/run/docker.sock:/var/run/docker.sock
|
||||||
- /sprint-data:/sprint-data
|
- /sprint-data:/sprint-data
|
||||||
|
- /root/.cache/act:/root/.cache/act
|
||||||
environment:
|
environment:
|
||||||
GITEA_INSTANCE_URL: https://gitea.chocomarsh.com/
|
GITEA_INSTANCE_URL: https://gitea.chocomarsh.com/
|
||||||
GITEA_RUNNER_REGISTRATION_TOKEN: $REGISTRATION_TOKEN
|
GITEA_RUNNER_REGISTRATION_TOKEN: $REGISTRATION_TOKEN
|
||||||
|
|||||||
@@ -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"
|
||||||
|
|||||||
@@ -3,3 +3,4 @@ FROM gitea/act_runner:nightly
|
|||||||
RUN apk add docker
|
RUN apk add docker
|
||||||
RUN apk add git
|
RUN apk add git
|
||||||
RUN apk add --no-cache nodejs
|
RUN apk add --no-cache nodejs
|
||||||
|
RUN apk add --no-cache make
|
||||||
|
|||||||
@@ -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,
|
||||||
|
|||||||
@@ -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,
|
||||||
|
|||||||
Reference in New Issue
Block a user