Skip to content

Commit

Permalink
Merge pull request #336 from Antreesy/fix/stable30-support
Browse files Browse the repository at this point in the history
  • Loading branch information
juliusknorr authored Aug 16, 2024
2 parents c9f88ba + 9bf907e commit f461b7b
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 3 deletions.
4 changes: 2 additions & 2 deletions bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ The following options can be provided:
--clone-all-apps-filtered
Do not only reduce the history of the server repository but also
the cloned apps.
APPS The apps to add to the development setup on top of the default apps
The default apps to be installed: ${APPS_TO_INSTALL[@]}
Expand Down Expand Up @@ -82,7 +82,7 @@ if [ -f ".env" ]; then
echo "❌ Repository path does not exist"
fi

for i in stable26 stable27 stable28
for i in stable26 stable27 stable28 stable29 stable30
do
echo "Stable $i repository path: ${STABLE_ROOT_PATH}/${i}"
STABLE_VERSION=$(grep "OC_VersionString" "${STABLE_ROOT_PATH}/${i}/version.php" | cut -d "'" -f 2)
Expand Down
33 changes: 32 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ services:
- stable27${DOMAIN_SUFFIX}
- stable28${DOMAIN_SUFFIX}
- stable29${DOMAIN_SUFFIX}
- stable30${DOMAIN_SUFFIX}
- mail${DOMAIN_SUFFIX}
- collabora${DOMAIN_SUFFIX}
- codedev${DOMAIN_SUFFIX}
Expand Down Expand Up @@ -564,6 +565,36 @@ services:
extra_hosts:
- host.docker.internal:host-gateway

stable30:
image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-81}:latest
environment:
SQL: ${SQL:-mysql}
NEXTCLOUD_AUTOINSTALL: "YES"
NEXTCLOUD_AUTOINSTALL_APPS:
WITH_REDIS: "YES"
VIRTUAL_HOST: stable30${DOMAIN_SUFFIX}
ADDITIONAL_APPS_PATH:
NEXTCLOUD_TRUSTED_DOMAINS:
PRIMARY: ${PRIMARY:-local}
PHP_XDEBUG_MODE: ${PHP_XDEBUG_MODE:-develop}
volumes:
- '${STABLE_ROOT_PATH}/stable30:/var/www/html'
- '${STABLE_ROOT_PATH}/stable30/apps-extra:/var/www/html/apps-extra'
- '${ADDITIONAL_APPS_PATH:-./data/apps-extra}:/var/www/html/apps-shared'
- /var/www/html/data
- /var/www/html/config
- /var/www/html/apps-writable
- ./data/skeleton/:/skeleton
- ./data/additional.config.php:/var/www/html/config/additional.config.php:ro
- ./data/shared:/shared
depends_on:
- database-${SQL:-mysql}
- redis
- mail
- ${PROXY_SERVICE:-proxy}
extra_hosts:
- host.docker.internal:host-gateway

database-sqlite:
image: rwgrim/docker-noop

Expand Down Expand Up @@ -1008,7 +1039,7 @@ services:
VIRTUAL_HOST: "talk-recording${DOMAIN_SUFFIX}"
VIRTUAL_PORT: 1234
shm_size: 2147483648

volumes:
data:
config:
Expand Down

0 comments on commit f461b7b

Please sign in to comment.