master #153

Merged
emmatveev merged 6 commits from master into dev 2025-11-24 03:10:13 +03:00
4 changed files with 10 additions and 5 deletions

View File

@@ -178,7 +178,9 @@ services:
order: start-first
gitea:
image: gitea/gitea:1.22.3
image: gitea/gitea:1.24.6
networks:
- postgres
volumes:
- /sprint-data/gitea:/data
- /etc/timezone:/etc/timezone
@@ -190,7 +192,7 @@ services:
USER_UID: 1000
USER_GID: 1000
GITEA__database__DB_TYPE: postgres
GITEA__database__HOST: pg.chocomarsh.com:5432
GITEA__database__HOST: postgres:5432
GITEA__database__NAME: gitea
GITEA__database__USER: postgres
GITEA__database__PASSWD: $DB_PASSWORD_PROD
@@ -209,6 +211,7 @@ services:
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- /sprint-data:/sprint-data
- /root/.cache/act:/root/.cache/act
environment:
GITEA_INSTANCE_URL: https://gitea.chocomarsh.com/
GITEA_RUNNER_REGISTRATION_TOKEN: $REGISTRATION_TOKEN

View File

@@ -2,7 +2,7 @@ version: '3.2'
services:
agent:
image: portainer/agent:2.11.1
image: portainer/agent:2.33.1
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- /var/lib/docker/volumes:/var/lib/docker/volumes
@@ -14,7 +14,7 @@ services:
constraints: [node.platform.os == linux]
portainer:
image: portainer/portainer-ce:2.11.1
image: portainer/portainer-ce:2.33.1
command: -H tcp://tasks.agent:9001 --tlsskipverify
ports:
- "9443:9443"

View File

@@ -3,3 +3,4 @@ FROM gitea/act_runner:nightly
RUN apk add docker
RUN apk add git
RUN apk add --no-cache nodejs
RUN apk add --no-cache make

View File

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