Skip to content

Commit e4d59b3

Browse files
authored
Docker updates for NC 32 (#150)
* feat(docker): bump up to NC 32 - add: fixed PG version as 18 alpine - fix: stage dep sevices * chore: fix code style * chore: update deploy script version * chore: update default network ip --------- Co-authored-by: mahiarirani <[email protected]>
1 parent 90f1c94 commit e4d59b3

File tree

4 files changed

+34
-33
lines changed

4 files changed

+34
-33
lines changed

cli/staging/deploy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ log_gap
119119

120120
DEPLOYMENT=()
121121
TIMESTAMP=$(date +%s)
122-
for version in {29..31}; do
122+
for version in {30..32}; do
123123
deploy "$version" &
124124
DEPLOYMENT+=($!)
125125
done

docker-compose.stage.yml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ services:
88
depends_on:
99
nextcloud:
1010
condition: service_started
11-
proxy:
12-
condition: service_healthy
1311
labels:
1412
caddy: ${APP_URL}
1513
caddy.reverse_proxy: '{{upstreams 80}}'
@@ -22,7 +20,7 @@ services:
2220
context: ./docker/nextcloud
2321
dockerfile: Dockerfile
2422
args:
25-
NC_VERSION: ${NC_VERSION:-31}
23+
NC_VERSION: ${NC_VERSION:-32}
2624
target: ${ENV:-development}
2725
restart: unless-stopped
2826
depends_on:
@@ -45,7 +43,7 @@ services:
4543
- ./:/var/www/html/custom_apps/files_external_ethswarm
4644

4745
cron:
48-
image: nextcloud:${NC_VERSION:-31}-fpm-alpine
46+
image: nextcloud:${NC_VERSION:-32}-fpm-alpine
4947
restart: always
5048
volumes:
5149
- nc-app:/var/www/html
@@ -75,7 +73,7 @@ services:
7573
- backend
7674

7775
postgres:
78-
image: postgres:alpine
76+
image: postgres:18-alpine
7977
restart: unless-stopped
8078
env_file:
8179
- .env
@@ -97,13 +95,13 @@ networks:
9795
frontend:
9896
ipam:
9997
config:
100-
- subnet: 172.${NC_VERSION:-31}.10.0/24
101-
gateway: 172.${NC_VERSION:-31}.10.1
98+
- subnet: 172.${NC_VERSION:-32}.10.0/24
99+
gateway: 172.${NC_VERSION:-32}.10.1
102100
backend:
103101
ipam:
104102
config:
105-
- subnet: 172.${NC_VERSION:-31}.20.0/24
106-
gateway: 172.${NC_VERSION:-31}.20.1
103+
- subnet: 172.${NC_VERSION:-32}.20.0/24
104+
gateway: 172.${NC_VERSION:-32}.20.1
107105
proxy:
108106
name: hejbit-network
109107
external: true

docker-compose.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ services:
3030
context: ./docker/nextcloud
3131
dockerfile: Dockerfile
3232
args:
33-
NC_VERSION: ${NC_VERSION:-31}
33+
NC_VERSION: ${NC_VERSION:-32}
3434
target: ${ENV:-development}
3535
restart: unless-stopped
3636
depends_on:
@@ -57,7 +57,7 @@ services:
5757
- ./:/var/www/html/custom_apps/files_external_ethswarm
5858

5959
cron:
60-
image: nextcloud:${NC_VERSION:-31}-fpm-alpine
60+
image: nextcloud:${NC_VERSION:-32}-fpm-alpine
6161
restart: always
6262
volumes:
6363
- nc-app:/var/www/html
@@ -89,7 +89,7 @@ services:
8989
- backend
9090

9191
postgres:
92-
image: postgres:alpine
92+
image: postgres:18-alpine
9393
restart: unless-stopped
9494
# ports:
9595
# - '5432:5432'

vendor-bin/sentry/composer.lock

Lines changed: 23 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)