66 Commits
dev ... prod

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
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
Deploy Prod / Push (pull_request) Successful in 17s
Deploy Prod / prepare (pull_request) Successful in 6s
Deploy Prod / Deploy prod (pull_request) Successful in 25s
2025-09-15 10:10:00 +03:00
624eddee2a Merge pull request 'fix' (#144) from master into prod
Reviewed-on: #144
2025-09-15 01:12:17 +03:00
ba43261482 Merge pull request 'fix' (#142) from master into prod
Reviewed-on: #142
2025-09-15 00:06:57 +03:00
59287f8240 Merge pull request 'master' (#141) from master into prod
Reviewed-on: #141
2025-09-14 23:57:24 +03:00
8f823afc21 Merge pull request 'fix' (#139) from master into prod
Reviewed-on: #139
2025-07-12 10:28:33 +03:00
489b5d00cc Merge pull request 'fix' (#138) from master into prod
Reviewed-on: #138
2025-07-12 10:22:15 +03:00
073ee88a84 Merge pull request 'fix' (#137) from master into prod
Reviewed-on: #137
2025-07-12 10:17:55 +03:00
054186bfcd Merge pull request 'fix' (#136) from master into prod
Reviewed-on: #136
2025-07-12 10:12:23 +03:00
2d66d20e41 Merge pull request 'fix' (#135) from master into prod
Reviewed-on: #135
2025-07-12 10:09:55 +03:00
49e99f2721 Merge pull request 'fix' (#134) from master into prod
Reviewed-on: #134
2025-07-11 22:46:40 +03:00
a6273a24dc Merge pull request 'fix' (#133) from master into prod
Reviewed-on: #133
2025-07-11 22:29:14 +03:00
5da9bc072b Merge pull request 'fix' (#132) from master into prod
Reviewed-on: #132
2025-07-11 22:23:22 +03:00
767ea96b31 Merge pull request 'fix' (#131) from master into prod
Reviewed-on: #131
2025-07-11 22:19:01 +03:00
9c8df2d4d4 Merge pull request 'fix' (#130) from master into prod
Reviewed-on: #130
2025-07-11 22:07:25 +03:00
e076d505f1 Merge pull request 'fix' (#129) from master into prod
Reviewed-on: #129
2025-07-11 21:50:17 +03:00
5a8e6cfa76 Merge pull request 'fix' (#128) from master into prod
Reviewed-on: #128
2025-07-11 21:28:33 +03:00
6647b0df21 Merge pull request 'fix' (#127) from master into prod
Reviewed-on: #127
2025-07-11 21:20:37 +03:00
0e0b2e57da Merge pull request 'fix' (#126) from master into prod
Reviewed-on: #126
2025-07-11 21:05:40 +03:00
cac1e5c4e0 Merge pull request 'fix' (#125) from master into prod
Reviewed-on: #125
2025-07-11 20:36:23 +03:00
45201de406 Merge pull request 'fix' (#124) from master into prod
Reviewed-on: #124
2025-07-11 20:24:33 +03:00
74a45eb95c Merge pull request 'fix' (#123) from master into prod
Reviewed-on: #123
2025-07-11 19:57:57 +03:00
26159bd068 Merge pull request 'fix' (#122) from master into prod
Reviewed-on: #122
2025-07-11 19:52:26 +03:00
f963a7e196 Merge pull request 'fix' (#121) from master into prod
Reviewed-on: #121
2025-07-10 18:43:34 +03:00
60d65bfd10 Merge pull request 'fix' (#120) from master into prod
Reviewed-on: #120
2025-07-10 18:19:12 +03:00
7c16255c61 Merge pull request 'fix' (#119) from master into prod
Reviewed-on: #119
2025-07-10 18:12:17 +03:00
ee6e9b7d12 Merge pull request 'Update .deploy-infra/deploy-prod.yaml' (#118) from master into prod
Reviewed-on: #118
2025-06-20 17:29:59 +03:00
1851bc0652 Merge pull request 'master' (#117) from master into prod
Reviewed-on: #117
2025-06-20 17:19:38 +03:00
0ba08e4a6d Merge pull request 'fix' (#115) from master into prod
Reviewed-on: #115
2025-06-14 23:01:18 +03:00
3e12bf6fe0 Merge pull request 'fix' (#114) from master into prod
Reviewed-on: #114
2025-06-14 22:55:18 +03:00
7fc4e7f086 Merge pull request 'master' (#113) from master into prod
Reviewed-on: #113
2025-06-14 22:45:41 +03:00
becb5c3aac Merge pull request 'fix' (#112) from master into prod
Reviewed-on: #112
2025-06-14 22:40:51 +03:00
a54f4a6eee Merge pull request 'fix' (#111) from master into prod
Reviewed-on: #111
2025-06-14 22:35:16 +03:00
fb4fcf5b27 Merge pull request 'fix' (#110) from master into prod
Reviewed-on: #110
2025-06-14 22:30:25 +03:00
45a035897d Merge pull request 'Update .deploy-infra/deploy-prod.yaml' (#109) from master into prod
Reviewed-on: #109
2025-06-14 20:21:54 +03:00
4da8e8e6e5 Merge pull request 'Update .deploy-infra/deploy-prod.yaml' (#108) from master into prod
Reviewed-on: #108
2025-06-14 20:12:41 +03:00
2a09bb0f48 Merge pull request 'Update .deploy-infra/deploy-prod.yaml' (#107) from master into prod
Reviewed-on: #107
2025-06-14 20:10:36 +03:00
d456e2d083 Merge pull request 'Update .deploy-infra/deploy-prod.yaml' (#106) from master into prod
Reviewed-on: #106
2025-06-14 20:07:01 +03:00
3f07d0ad84 Merge pull request 'Update .deploy-infra/deploy-prod.yaml' (#105) from master into prod
Reviewed-on: #105
2025-06-14 19:55:57 +03:00
f8488d72e7 Merge pull request 'Update .deploy-infra/deploy-prod.yaml' (#104) from master into prod
Reviewed-on: #104
2025-06-14 19:53:17 +03:00
7b0a5ca568 Merge pull request 'fix' (#103) from master into prod
Reviewed-on: #103
2025-06-14 13:02:27 +03:00
cab9ef5d08 Merge pull request 'fix' (#102) from master into prod
Reviewed-on: #102
2025-06-14 12:42:45 +03:00
e4f6078e63 Merge pull request 'fix' (#101) from master into prod
Reviewed-on: #101
2025-06-14 04:44:16 +03:00
8ebf434fb2 Merge pull request 'master' (#100) from master into prod
Reviewed-on: #100
2025-06-14 03:37:48 +03:00
2b0fc2dee3 Merge pull request 'master' (#96) from master into prod
Reviewed-on: #96
2025-06-13 02:48:50 +03:00
f72974a593 Merge pull request 'fix' (#92) from master into prod
Reviewed-on: #92
2025-06-12 22:14:37 +03:00
13518e77d6 Merge pull request 'fix' (#90) from master into prod
Reviewed-on: #90
2025-06-12 13:52:39 +03:00
a424d7950e Merge pull request 'master' (#88) from master into prod
Reviewed-on: #88
2025-06-12 13:27:18 +03:00
fe415f0bd8 Merge pull request 'master' (#84) from master into prod
Reviewed-on: #84
2025-06-12 01:13:26 +03:00
07008122a8 Merge pull request 'master' (#73) from master into prod
Reviewed-on: #73
2025-06-04 21:20:54 +03:00
031960c451 Merge pull request 'master' (#71) from master into prod
Reviewed-on: #71
2025-06-04 03:43:12 +03:00
a1fcd98eba Merge pull request 'master' (#69) from master into prod
Reviewed-on: #69
2025-06-04 02:47:18 +03:00
4e4bdf12cb Merge pull request 'fix' (#42) from master into prod
Reviewed-on: #42
2025-03-28 21:49:37 +03:00
e1b8bdb230 Merge pull request 'keycloak' (#41) from master into prod
Reviewed-on: #41
2025-03-28 21:45:31 +03:00
893a357eca Merge pull request 'keycloak' (#40) from master into prod
Reviewed-on: #40
2025-03-28 21:43:05 +03:00
feee9ffb6d Merge pull request 'keycloak' (#39) from master into prod
Reviewed-on: #39
2025-03-28 21:34:56 +03:00
dd63cf69cd Merge pull request 'master' (#38) from master into prod
Reviewed-on: #38
2025-03-28 21:28:13 +03:00
829d978ac8 Merge pull request 'master' (#36) from master into prod
Reviewed-on: #36
2025-02-14 01:10:55 +03:00
3 changed files with 8 additions and 4 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

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

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