Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cli/staging/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 7 additions & 9 deletions docker-compose.stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ services:
depends_on:
nextcloud:
condition: service_started
proxy:
condition: service_healthy
labels:
caddy: ${APP_URL}
caddy.reverse_proxy: '{{upstreams 80}}'
Expand All @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -75,7 +73,7 @@ services:
- backend

postgres:
image: postgres:alpine
image: postgres:18-alpine
restart: unless-stopped
env_file:
- .env
Expand All @@ -97,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
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -89,7 +89,7 @@ services:
- backend

postgres:
image: postgres:alpine
image: postgres:18-alpine
restart: unless-stopped
# ports:
# - '5432:5432'
Expand Down
43 changes: 23 additions & 20 deletions vendor-bin/sentry/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.