From 1347bcc3216fdeaed54bcad744d384371ebdd880 Mon Sep 17 00:00:00 2001 From: Egor Matveev Date: Mon, 15 Sep 2025 10:10:00 +0300 Subject: [PATCH 1/6] fix --- .deploy-portainer/deploy-prod.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.deploy-portainer/deploy-prod.yaml b/.deploy-portainer/deploy-prod.yaml index a7234a1..c75293d 100644 --- a/.deploy-portainer/deploy-prod.yaml +++ b/.deploy-portainer/deploy-prod.yaml @@ -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" From b0b3dbdbd611529d876143063cab8fd1dc3549b5 Mon Sep 17 00:00:00 2001 From: emmatveev Date: Sat, 20 Sep 2025 13:07:11 +0300 Subject: [PATCH 2/6] Update .deploy-infra/deploy-prod.yaml --- .deploy-infra/deploy-prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.deploy-infra/deploy-prod.yaml b/.deploy-infra/deploy-prod.yaml index 8cccb71..f224240 100755 --- a/.deploy-infra/deploy-prod.yaml +++ b/.deploy-infra/deploy-prod.yaml @@ -178,7 +178,7 @@ services: order: start-first gitea: - image: gitea/gitea:1.22.3 + image: gitea/gitea:1.24.6 volumes: - /sprint-data/gitea:/data - /etc/timezone:/etc/timezone From e706e91a2a930ad452d01e209fb2f930cb60dfa0 Mon Sep 17 00:00:00 2001 From: emmatveev Date: Sat, 20 Sep 2025 17:08:44 +0300 Subject: [PATCH 3/6] Update .deploy-infra/deploy-prod.yaml --- .deploy-infra/deploy-prod.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.deploy-infra/deploy-prod.yaml b/.deploy-infra/deploy-prod.yaml index f224240..715620c 100755 --- a/.deploy-infra/deploy-prod.yaml +++ b/.deploy-infra/deploy-prod.yaml @@ -179,6 +179,8 @@ services: gitea: 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 From d8c68a230754d99b375f82bbe25a472f90cd74f7 Mon Sep 17 00:00:00 2001 From: Egor Matveev Date: Sun, 28 Sep 2025 14:13:03 +0300 Subject: [PATCH 4/6] fix --- gitea-runner/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/gitea-runner/Dockerfile b/gitea-runner/Dockerfile index 1b7d8ce..4e2379d 100644 --- a/gitea-runner/Dockerfile +++ b/gitea-runner/Dockerfile @@ -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 From 7795898546581486212982fcb76189664f55bce2 Mon Sep 17 00:00:00 2001 From: Egor Matveev Date: Mon, 29 Sep 2025 00:14:06 +0300 Subject: [PATCH 5/6] fix --- .deploy-infra/deploy-prod.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.deploy-infra/deploy-prod.yaml b/.deploy-infra/deploy-prod.yaml index 715620c..80caadd 100755 --- a/.deploy-infra/deploy-prod.yaml +++ b/.deploy-infra/deploy-prod.yaml @@ -211,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 From d7f8046580061526f7ce4127d2df7dabfc0fa09d Mon Sep 17 00:00:00 2001 From: Egor Matveev Date: Mon, 24 Nov 2025 03:09:31 +0300 Subject: [PATCH 6/6] fix --- nginx/nginx-dev/prepare.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nginx/nginx-dev/prepare.py b/nginx/nginx-dev/prepare.py index 37a903c..8e6e0bd 100644 --- a/nginx/nginx-dev/prepare.py +++ b/nginx/nginx-dev/prepare.py @@ -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(