Compare commits

8 Commits

Author SHA1 Message Date
eeeec03ab8 Merge pull request 'fix' (#151) from master into prod
Reviewed-on: #151
2025-09-29 00:14:28 +03:00
Egor Matveev
7795898546 fix
All checks were successful
Deploy Prod / Build (pull_request) Successful in 19s
Deploy Prod / Push (pull_request) Successful in 11s
Deploy Prod / prepare (pull_request) Successful in 4s
Deploy Prod / Deploy prod (pull_request) Successful in 23s
2025-09-29 00:14:06 +03:00
ff5ae0220d Merge pull request 'fix' (#150) from master into prod
Reviewed-on: #150
2025-09-28 14:13:35 +03:00
Egor Matveev
d8c68a2307 fix
All checks were successful
Deploy Prod / Build (pull_request) Successful in 30s
Deploy Prod / Push (pull_request) Successful in 16s
Deploy Prod / prepare (pull_request) Successful in 7s
Deploy Prod / Deploy prod (pull_request) Successful in 27s
2025-09-28 14:13:03 +03:00
6ea0e23869 Merge pull request 'Update .deploy-infra/deploy-prod.yaml' (#149) from master into prod
Reviewed-on: #149
2025-09-20 17:08:57 +03:00
e706e91a2a Update .deploy-infra/deploy-prod.yaml
All checks were successful
Deploy Prod / Build (pull_request) Successful in 8s
Deploy Prod / Push (pull_request) Successful in 12s
Deploy Prod / prepare (pull_request) Successful in 4s
Deploy Prod / Deploy prod (pull_request) Successful in 22s
2025-09-20 17:08:44 +03:00
5fe5b5ed6f Merge pull request 'Update .deploy-infra/deploy-prod.yaml' (#147) from master into prod
Reviewed-on: #147
2025-09-20 13:07:24 +03:00
b0b3dbdbd6 Update .deploy-infra/deploy-prod.yaml
All checks were successful
Deploy Prod / Build (pull_request) Successful in 7s
Deploy Prod / Push (pull_request) Successful in 12s
Deploy Prod / prepare (pull_request) Successful in 6s
Deploy Prod / Deploy prod (pull_request) Successful in 25s
2025-09-20 13:07:11 +03:00
2 changed files with 6 additions and 2 deletions

View File

@@ -178,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
@@ -190,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
@@ -209,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

View File

@@ -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