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

Merge pull request 'master' (#153) from master into dev

Browse Source 
Reviewed-on: #153
This commit was merged in pull request #153.
This commit is contained in:
emmatveev
2025-11-24 03:10:12 +03:00
parent 090b437186 d7f8046580
commit e1a93b3c09
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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"

1
gitea-runner/Dockerfile
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

3
nginx/nginx-dev/prepare.py
View File

@@ -39,6 +39,7 @@ for host, params in hosts.items():
ssl_certificate /etc/nginx/{host}/fullchain.pem; ssl_certificate /etc/nginx/{host}/fullchain.pem;
ssl_certificate_key /etc/nginx/{host}/privkey.pem; ssl_certificate_key /etc/nginx/{host}/privkey.pem;
proxy_http_version 1.1;
add_header X-Frame-Options "SAMEORIGIN" always; add_header X-Frame-Options "SAMEORIGIN" always;
add_header X-XSS-Protection "1; mode=block" always; add_header X-XSS-Protection "1; mode=block" always;
add_header X-Content-Type-Options "nosniff" always; add_header X-Content-Type-Options "nosniff" always;
@@ -50,7 +51,7 @@ for host, params in hosts.items():
location / {{ location / {{
resolver 127.0.0.11; resolver 127.0.0.11;
proxy_pass http://{target_host}:{port}$request_uri; proxy_pass http://{target_host}:{port};
}} }}
}}\n\n }}\n\n
""".format( """.format(