From 35989eeb1fc204af4b47b7f7b6937afd25d46f75 Mon Sep 17 00:00:00 2001 From: Mahyar Iranibazaz Date: Tue, 21 Oct 2025 09:57:43 -0300 Subject: [PATCH 1/4] feat(docker): bump up to NC 32 - add: fixed PG version as 18 alpine - fix: stage dep sevices --- docker-compose.stage.yml | 8 +++----- docker-compose.yml | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/docker-compose.stage.yml b/docker-compose.stage.yml index 417a43d..4325492 100755 --- a/docker-compose.stage.yml +++ b/docker-compose.stage.yml @@ -8,8 +8,6 @@ services: depends_on: nextcloud: condition: service_started - proxy: - condition: service_healthy labels: caddy: ${APP_URL} caddy.reverse_proxy: '{{upstreams 80}}' @@ -22,7 +20,7 @@ services: context: ./docker/nextcloud dockerfile: Dockerfile args: - NC_VERSION: ${NC_VERSION:-31} + NC_VERSION: ${NC_VERSION:-32} target: ${ENV:-development} restart: unless-stopped depends_on: @@ -45,7 +43,7 @@ services: - ./:/var/www/html/custom_apps/files_external_ethswarm cron: - image: nextcloud:${NC_VERSION:-31}-fpm-alpine + image: nextcloud:${NC_VERSION:-32}-fpm-alpine restart: always volumes: - nc-app:/var/www/html @@ -75,7 +73,7 @@ services: - backend postgres: - image: postgres:alpine + image: postgres:18-alpine restart: unless-stopped env_file: - .env diff --git a/docker-compose.yml b/docker-compose.yml index c40bf90..dceeecc 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,7 +30,7 @@ services: context: ./docker/nextcloud dockerfile: Dockerfile args: - NC_VERSION: ${NC_VERSION:-31} + NC_VERSION: ${NC_VERSION:-32} target: ${ENV:-development} restart: unless-stopped depends_on: @@ -57,7 +57,7 @@ services: - ./:/var/www/html/custom_apps/files_external_ethswarm cron: - image: nextcloud:${NC_VERSION:-31}-fpm-alpine + image: nextcloud:${NC_VERSION:-32}-fpm-alpine restart: always volumes: - nc-app:/var/www/html @@ -89,7 +89,7 @@ services: - backend postgres: - image: postgres:alpine + image: postgres:18-alpine restart: unless-stopped # ports: # - '5432:5432' From 5ab1bd3ebd9da9ceea0d340fb14043df0c5988fc Mon Sep 17 00:00:00 2001 From: mahiarirani <10583381+mahiarirani@users.noreply.github.com> Date: Tue, 21 Oct 2025 13:01:25 +0000 Subject: [PATCH 2/4] chore: fix code style --- vendor-bin/sentry/composer.lock | 43 ++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/vendor-bin/sentry/composer.lock b/vendor-bin/sentry/composer.lock index 94c7567..100ea0e 100644 --- a/vendor-bin/sentry/composer.lock +++ b/vendor-bin/sentry/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "guzzlehttp/psr7", - "version": "2.7.1", + "version": "2.8.0", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "c2270caaabe631b3b44c85f99e5a04bbb8060d16" + "reference": "21dc724a0583619cd1652f673303492272778051" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/c2270caaabe631b3b44c85f99e5a04bbb8060d16", - "reference": "c2270caaabe631b3b44c85f99e5a04bbb8060d16", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/21dc724a0583619cd1652f673303492272778051", + "reference": "21dc724a0583619cd1652f673303492272778051", "shasum": "" }, "require": { @@ -33,7 +33,7 @@ "require-dev": { "bamarni/composer-bin-plugin": "^1.8.2", "http-interop/http-factory-tests": "0.9.0", - "phpunit/phpunit": "^8.5.39 || ^9.6.20" + "phpunit/phpunit": "^8.5.44 || ^9.6.25" }, "suggest": { "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses" @@ -104,7 +104,7 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/2.7.1" + "source": "https://github.com/guzzle/psr7/tree/2.8.0" }, "funding": [ { @@ -120,7 +120,7 @@ "type": "tidelift" } ], - "time": "2025-03-27T12:30:47+00:00" + "time": "2025-08-23T21:21:41+00:00" }, { "name": "jean85/pretty-package-versions", @@ -386,16 +386,16 @@ }, { "name": "sentry/sentry", - "version": "4.14.1", + "version": "4.17.0", "source": { "type": "git", "url": "https://github.com/getsentry/sentry-php.git", - "reference": "a28c4a6f5fda2bf730789a638501d7a737a64eda" + "reference": "62927369a572efc27ddbd89e466e17788329224b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/a28c4a6f5fda2bf730789a638501d7a737a64eda", - "reference": "a28c4a6f5fda2bf730789a638501d7a737a64eda", + "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/62927369a572efc27ddbd89e466e17788329224b", + "reference": "62927369a572efc27ddbd89e466e17788329224b", "shasum": "" }, "require": { @@ -419,7 +419,6 @@ "phpbench/phpbench": "^1.0", "phpstan/phpstan": "^1.3", "phpunit/phpunit": "^8.5|^9.6", - "symfony/phpunit-bridge": "^5.2|^6.0|^7.0", "vimeo/psalm": "^4.17" }, "suggest": { @@ -459,7 +458,7 @@ ], "support": { "issues": "https://github.com/getsentry/sentry-php/issues", - "source": "https://github.com/getsentry/sentry-php/tree/4.14.1" + "source": "https://github.com/getsentry/sentry-php/tree/4.17.0" }, "funding": [ { @@ -471,7 +470,7 @@ "type": "custom" } ], - "time": "2025-06-23T15:25:52+00:00" + "time": "2025-10-20T12:57:02+00:00" }, { "name": "symfony/deprecation-contracts", @@ -542,16 +541,16 @@ }, { "name": "symfony/options-resolver", - "version": "v7.3.0", + "version": "v7.3.3", "source": { "type": "git", "url": "https://github.com/symfony/options-resolver.git", - "reference": "afb9a8038025e5dbc657378bfab9198d75f10fca" + "reference": "0ff2f5c3df08a395232bbc3c2eb7e84912df911d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/options-resolver/zipball/afb9a8038025e5dbc657378bfab9198d75f10fca", - "reference": "afb9a8038025e5dbc657378bfab9198d75f10fca", + "url": "https://api.github.com/repos/symfony/options-resolver/zipball/0ff2f5c3df08a395232bbc3c2eb7e84912df911d", + "reference": "0ff2f5c3df08a395232bbc3c2eb7e84912df911d", "shasum": "" }, "require": { @@ -589,7 +588,7 @@ "options" ], "support": { - "source": "https://github.com/symfony/options-resolver/tree/v7.3.0" + "source": "https://github.com/symfony/options-resolver/tree/v7.3.3" }, "funding": [ { @@ -600,12 +599,16 @@ "url": "https://github.com/fabpot", "type": "github" }, + { + "url": "https://github.com/nicolas-grekas", + "type": "github" + }, { "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", "type": "tidelift" } ], - "time": "2025-04-04T13:12:05+00:00" + "time": "2025-08-05T10:16:07+00:00" } ], "packages-dev": [], From 94a73e567d36b46dab4c0238e848313ad7934de0 Mon Sep 17 00:00:00 2001 From: Mahyar Iranibazaz Date: Tue, 21 Oct 2025 11:47:07 -0300 Subject: [PATCH 3/4] chore: update deploy script version --- cli/staging/deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/staging/deploy.sh b/cli/staging/deploy.sh index cf60d2a..4a566a3 100644 --- a/cli/staging/deploy.sh +++ b/cli/staging/deploy.sh @@ -119,7 +119,7 @@ log_gap DEPLOYMENT=() TIMESTAMP=$(date +%s) -for version in {29..31}; do +for version in {30..32}; do deploy "$version" & DEPLOYMENT+=($!) done From 07044e45d5ac30712f268d048e74206f53a9542e Mon Sep 17 00:00:00 2001 From: Mahyar Iranibazaz Date: Tue, 21 Oct 2025 11:48:30 -0300 Subject: [PATCH 4/4] chore: update default network ip --- docker-compose.stage.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.stage.yml b/docker-compose.stage.yml index 4325492..0707361 100755 --- a/docker-compose.stage.yml +++ b/docker-compose.stage.yml @@ -95,13 +95,13 @@ networks: frontend: ipam: config: - - subnet: 172.${NC_VERSION:-31}.10.0/24 - gateway: 172.${NC_VERSION:-31}.10.1 + - subnet: 172.${NC_VERSION:-32}.10.0/24 + gateway: 172.${NC_VERSION:-32}.10.1 backend: ipam: config: - - subnet: 172.${NC_VERSION:-31}.20.0/24 - gateway: 172.${NC_VERSION:-31}.20.1 + - subnet: 172.${NC_VERSION:-32}.20.0/24 + gateway: 172.${NC_VERSION:-32}.20.1 proxy: name: hejbit-network external: true