feat(sh):Create 2 environment variables

I create APPS and SERVER_GIT_WITH_ORGANIZATIO env var when we generate the .env file. Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>
build(sh): Fix shellchecl add source=/dev/null
2022-11-08 15:38:57 +01:00 · 2022-11-08 15:38:17 +01:00 · 2022-11-08 11:40:22 +01:00 · 2022-11-08 11:32:27 +01:00 · 2022-11-08 11:23:46 +01:00 · 2022-11-08 11:20:35 +01:00
12 changed files with 233 additions and 92 deletions
@@ -7,3 +7,4 @@ workspace/
 .*
 data/skeleton/
 wip/
+my-apps/
@@ -292,7 +292,7 @@ docker-compose up -d elasticsearch elasticsearch-ui
 Primary object storage can be enabled by setting the `PRIMARY=minio` environment variable either in your .env file or in docker-compose.yml for individual containers.

 ```bash
-docker-composer up proxy nextcloud minio
+docker-compose up proxy nextcloud minio
 ```

 ## Development
@@ -332,7 +332,7 @@ Users are named the same as the instance name, e.g. gs1, gs2
 Enable the imaginary server for generating previews

 ```bash
-docker-composer up proxy nextcloud previews_hpb
+docker-compose up proxy nextcloud previews_hpb
 ./scripts/enable-preview-imaginary.sh
 ```

@@ -19,12 +19,27 @@ indent_cli() {
 function install_app() {
 	(
 		echo "🌏 Fetching $1"
-		(git clone https://github.com/nextcloud/"$1".git workspace/server/apps-extra/"$1" 2>&1 | indent_cli &&
+		(git clone "$SERVER_GIT_WITH_ORGANIZATION/$1".git "$PWD/my-apps/$1" 2>&1 | indent_cli &&
 			echo "✅ $1 installed") ||
 			echo "❌ Failed to install $1"
 	) | indent
 }

+function install_apps() {
+	if (( ${#APPS[@]} != 0 )); then
+		if test -z "$SERVER_GIT_WITH_ORGANIZATION"; then
+			echo "❌ You didn't define the $SERVER_GIT_WITH_ORGANIZATION variable."
+			exit 10
+		fi
+		echo "⏩ Clonning of applications in progress"
+		for app in "${APPS[@]}"; do
+			install_app "$app"
+		done
+	else
+		echo "⚠️ You don't have apps to clone."
+	fi
+}
+
 function is_installed() {
 	(
 		if [ -x "$(command -v "$1")" ]; then
@@ -67,28 +82,31 @@ mkdir -p workspace/
 #	) || echo "❌ Failed to setup worktree for stable19"
 #) | indent

-mkdir -p workspace/server/apps-extra
-install_app viewer
-install_app recommendations
-install_app files_pdfviewer
-install_app profiler
+mkdir -p ./my-apps

 echo
 echo
 echo "⏩ Setup your environment in an .env file"
 if [ ! -f ".env" ]; then
 cat <<EOT >.env
-COMPOSE_PROJECT_NAME=nextcloud
+COMPOSE_PROJECT_NAME=master
 DOMAIN_SUFFIX=.local
 REPO_PATH_SERVER=$PWD/workspace/server
-ADDITIONAL_APPS_PATH=$PWD/workspace/server/apps-extra
+ADDITIONAL_APPS_PATH=$PWD/my-apps
 STABLE_ROOT_PATH=$PWD/workspace
 NEXTCLOUD_AUTOINSTALL_APPS="viewer profiler"
 DOCKER_SUBNET=192.168.21.0/24
 PORTBASE=821
+APPS=()
+SERVER_GIT_WITH_ORGANIZATION=""
 EOT
 fi

+# shellcheck source=/dev/null
+source .env
+
+install_apps
+
 if [[ $(uname -m) == 'arm64' ]]; then
 	echo "Setting custom containers for arm platform"

@@ -34,6 +34,7 @@ services:
          - stable22${DOMAIN_SUFFIX}
          - stable23${DOMAIN_SUFFIX}
          - stable24${DOMAIN_SUFFIX}
+          - stable25${DOMAIN_SUFFIX}
          - collabora${DOMAIN_SUFFIX}
          - onlyoffice${DOMAIN_SUFFIX}
          - proxy${DOMAIN_SUFFIX}
@@ -57,7 +58,7 @@ services:
      - ./docker/configs/haproxy.conf:/usr/local/etc/haproxy/haproxy.cfg:ro

  nextcloud:
-    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-74}:latest
+    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-81}:latest
    environment:
      SQL: ${SQL:-mysql}
      NEXTCLOUD_AUTOINSTALL: "YES"
@@ -69,10 +70,10 @@ services:
      BLACKFIRE_CLIENT_ID:
      BLACKFIRE_CLIENT_TOKEN:
    volumes:
-      - '${REPO_PATH_SERVER:-/home/jus/repos/nextcloud/server}:/var/www/html'
+      - '${REPO_PATH_SERVER}:/var/www/html'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - data:/var/www/html/data
      - config:/var/www/html/config
-      - '${ADDITIONAL_APPS_PATH:-./data/apps-extra}:/var/www/html/apps-extra'
      - /var/www/html/apps-writable
      - ./data/skeleton/:/skeleton
      - ./data/additional.config.php:/var/www/html/config/additional.config.php:ro
@@ -87,13 +88,13 @@ services:
      - host.docker.internal:host-gateway

  nextcloud2:
-    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-73}:latest
+    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-81}:latest
    environment:
      SQL: 'mysql'
      VIRTUAL_HOST: "nextcloud2${DOMAIN_SUFFIX}"
    volumes:
-      - '${REPO_PATH_SERVER:-/home/jus/repos/nextcloud/server}:/var/www/html'
-      - '${ADDITIONAL_APPS_PATH:-./data/apps-extra}:/var/www/html/apps-extra'
+      - '${REPO_PATH_SERVER}:/var/www/html'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - ./data/skeleton/:/skeleton
      - ./data/additional.config.php:/var/www/html/config/additional.config.php:ro
    ports:
@@ -106,13 +107,13 @@ services:
      - host.docker.internal:host-gateway

  nextcloud3:
-    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-73}:latest
+    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-81}:latest
    environment:
-      SQL: 'mysql'
+      SQL: ${SQL:-mysql}
      VIRTUAL_HOST: "nextcloud3${DOMAIN_SUFFIX}"
    volumes:
-      - '${REPO_PATH_SERVER:-/home/jus/repos/nextcloud/server}:/var/www/html'
-      - '${ADDITIONAL_APPS_PATH:-./data/apps-extra}:/var/www/html/apps-extra'
+      - '${REPO_PATH_SERVER}:/var/www/html'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - ./data/skeleton/:/skeleton
      - ./docker/configs/config.php:/var/www/html/config/writable.config.php:ro
      - ./data/additional.config.php:/var/www/html/config/additional.config.php:ro
@@ -124,9 +125,9 @@ services:
      - host.docker.internal:host-gateway

  stable16:
-    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-72}:latest
+    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-73}:latest
    environment:
-      SQL: 'sqlite'
+      SQL: ${SQL:-mysql}
      NEXTCLOUD_AUTOINSTALL: "YES"
      NEXTCLOUD_AUTOINSTALL_APPS:
      WITH_REDIS: "YES"
@@ -134,23 +135,27 @@ services:
      ADDITIONAL_APPS_PATH:
      NEXTCLOUD_TRUSTED_DOMAINS:
    volumes:
-      - '${STABLE_ROOT_PATH:-/home/jus/repos/nextcloud}/stable16:/var/www/html'
-      - '${STABLE_ROOT_PATH:-/home/jus/repos/nextcloud}/stable16/apps-extra:/var/www/html/apps-extra'
+      - '${STABLE_ROOT_PATH}/stable16:/var/www/html'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - /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
+    ports:
+      - "${PORTBASE:-800}0:80"
    depends_on:
+      - ${DB_SERVICE:-database-mysql}
      - redis
      - mail
    extra_hosts:
      - host.docker.internal:host-gateway

  stable17:
-    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-72}:latest
+    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-73}:latest
    environment:
-      SQL: 'sqlite'
+      SQL: ${SQL:-mysql}
      NEXTCLOUD_AUTOINSTALL: "YES"
      NEXTCLOUD_AUTOINSTALL_APPS:
      WITH_REDIS: "YES"
@@ -158,23 +163,27 @@ services:
      ADDITIONAL_APPS_PATH:
      NEXTCLOUD_TRUSTED_DOMAINS:
    volumes:
-      - '${STABLE_ROOT_PATH:-/home/jus/repos/nextcloud}/stable17:/var/www/html'
-      - '${STABLE_ROOT_PATH:-/home/jus/repos/nextcloud}/stable17/apps-extra:/var/www/html/apps-extra'
+      - '${STABLE_ROOT_PATH}/stable17:/var/www/html'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - /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
+    ports:
+      - "${PORTBASE:-800}0:80"
    depends_on:
+      - ${DB_SERVICE:-database-mysql}
      - redis
      - mail
    extra_hosts:
      - host.docker.internal:host-gateway

  stable18:
-    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-73}:latest
+    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-74}:latest
    environment:
-      SQL: 'sqlite'
+      SQL: ${SQL:-mysql}
      NEXTCLOUD_AUTOINSTALL: "YES"
      NEXTCLOUD_AUTOINSTALL_APPS:
      WITH_REDIS: "YES"
@@ -182,25 +191,27 @@ services:
      ADDITIONAL_APPS_PATH:
      NEXTCLOUD_TRUSTED_DOMAINS:
    volumes:
-      - '${STABLE_ROOT_PATH:-/home/jus/repos/nextcloud}/stable18:/var/www/html'
-      - '${STABLE_ROOT_PATH:-/home/jus/repos/nextcloud}/stable18/apps-extra:/var/www/html/apps-extra'
+      - '${STABLE_ROOT_PATH}/stable18:/var/www/html'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - /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
    ports:
      - "${PORTBASE:-800}0:80"
    depends_on:
+      - ${DB_SERVICE:-database-mysql}
      - redis
      - mail
    extra_hosts:
      - host.docker.internal:host-gateway

  stable19:
-    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-72}:latest
+    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-74}:latest
    environment:
-      SQL: 'sqlite'
+      SQL: ${SQL:-mysql}
      NEXTCLOUD_AUTOINSTALL: "YES"
      NEXTCLOUD_AUTOINSTALL_APPS:
      WITH_REDIS: "YES"
@@ -208,20 +219,27 @@ services:
      ADDITIONAL_APPS_PATH:
      NEXTCLOUD_TRUSTED_DOMAINS:
    volumes:
-      - '${STABLE_ROOT_PATH:-/home/jus/repos/nextcloud}/stable19:/var/www/html'
-      - '${STABLE_ROOT_PATH:-/home/jus/repos/nextcloud}/stable19/apps-extra:/var/www/html/apps-extra'
+      - '${STABLE_ROOT_PATH}/stable19:/var/www/html'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
+      - /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
+    ports:
+      - "${PORTBASE:-800}0:80"
    depends_on:
+      - ${DB_SERVICE:-database-mysql}
      - redis
      - mail
    extra_hosts:
      - host.docker.internal:host-gateway

  stable20:
-    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-72}:latest
+    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-74}:latest
    environment:
-      SQL: 'sqlite'
+      SQL: ${SQL:-mysql}
      NEXTCLOUD_AUTOINSTALL: "YES"
      NEXTCLOUD_AUTOINSTALL_APPS:
      WITH_REDIS: "YES"
@@ -229,20 +247,27 @@ services:
      ADDITIONAL_APPS_PATH:
      NEXTCLOUD_TRUSTED_DOMAINS:
    volumes:
-      - '${STABLE_ROOT_PATH:-/home/jus/repos/nextcloud}/stable20:/var/www/html'
-      - '${STABLE_ROOT_PATH:-/home/jus/repos/nextcloud}/stable20/apps-extra:/var/www/html/apps-extra'
+      - '${STABLE_ROOT_PATH}/stable20:/var/www/html'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
+      - /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
+    ports:
+      - "${PORTBASE:-800}0:80"
    depends_on:
+      - ${DB_SERVICE:-database-mysql}
      - redis
      - mail
    extra_hosts:
      - host.docker.internal:host-gateway

  stable21:
-    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-73}:latest
+    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-80}:latest
    environment:
-      SQL: 'sqlite'
+      SQL: ${SQL:-mysql}
      NEXTCLOUD_AUTOINSTALL: "YES"
      NEXTCLOUD_AUTOINSTALL_APPS:
      WITH_REDIS: "YES"
@@ -250,20 +275,27 @@ services:
      ADDITIONAL_APPS_PATH:
      NEXTCLOUD_TRUSTED_DOMAINS:
    volumes:
-      - '${STABLE_ROOT_PATH:-/home/jus/repos/nextcloud}/stable21:/var/www/html'
-      - '${STABLE_ROOT_PATH:-/home/jus/repos/nextcloud}/stable21/apps-extra:/var/www/html/apps-extra'
+      - '${STABLE_ROOT_PATH}/stable21:/var/www/html'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
+      - /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
+    ports:
+      - "${PORTBASE:-800}0:80"
    depends_on:
+      - ${DB_SERVICE:-database-mysql}
      - redis
      - mail
    extra_hosts:
      - host.docker.internal:host-gateway

  stable22:
-    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-73}:latest
+    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-80}:latest
    environment:
-      SQL: 'sqlite'
+      SQL: ${SQL:-mysql}
      NEXTCLOUD_AUTOINSTALL: "YES"
      NEXTCLOUD_AUTOINSTALL_APPS:
      WITH_REDIS: "YES"
@@ -271,46 +303,27 @@ services:
      ADDITIONAL_APPS_PATH:
      NEXTCLOUD_TRUSTED_DOMAINS:
    volumes:
-      - '${STABLE_ROOT_PATH:-/home/jus/repos/nextcloud}/stable22:/var/www/html'
-      - '${STABLE_ROOT_PATH:-/home/jus/repos/nextcloud}/stable22/apps-extra:/var/www/html/apps-extra'
+      - '${STABLE_ROOT_PATH}/stable22:/var/www/html'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - /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
+    ports:
+      - "${PORTBASE:-800}0:80"
    depends_on:
-      - redis
-      - mail
-    extra_hosts:
-      - host.docker.internal:host-gateway
-
-  stable24:
-    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-74}:latest
-    environment:
-      SQL: 'mysql'
-      NEXTCLOUD_AUTOINSTALL: "YES"
-      NEXTCLOUD_AUTOINSTALL_APPS:
-      WITH_REDIS: "YES"
-      VIRTUAL_HOST: stable24${DOMAIN_SUFFIX}
-      ADDITIONAL_APPS_PATH:
-      NEXTCLOUD_TRUSTED_DOMAINS:
-    volumes:
-      - '${STABLE_ROOT_PATH:-/home/jus/repos/nextcloud}/stable24:/var/www/html'
-      - '${STABLE_ROOT_PATH:-/home/jus/repos/nextcloud}/stable24/apps-extra:/var/www/html/apps-extra'
-      - /var/www/html/data
-      - /var/www/html/config
-      - /var/www/html/apps-writable
-      - ./data/additional.config.php:/var/www/html/config/additional.config.php:ro
-    depends_on:
+      - ${DB_SERVICE:-database-mysql}
      - redis
      - mail
    extra_hosts:
      - host.docker.internal:host-gateway

  stable23:
-    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-73}:latest
+    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-80}:latest
    environment:
-      SQL: 'sqlite'
+      SQL: ${SQL:-mysql}
      NEXTCLOUD_AUTOINSTALL: "YES"
      NEXTCLOUD_AUTOINSTALL_APPS:
      WITH_REDIS: "YES"
@@ -318,10 +331,74 @@ services:
      ADDITIONAL_APPS_PATH:
      NEXTCLOUD_TRUSTED_DOMAINS:
    volumes:
-      - '${STABLE_ROOT_PATH:-/home/jus/repos/nextcloud}/stable23:/var/www/html'
-      - '${STABLE_ROOT_PATH:-/home/jus/repos/nextcloud}/stable23/apps-extra:/var/www/html/apps-extra'
+      - '${STABLE_ROOT_PATH}/stable23:/var/www/html'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
+      - /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
+    ports:
+      - "${PORTBASE:-800}0:80"
    depends_on:
+      - ${DB_SERVICE:-database-mysql}
+      - redis
+      - mail
+    extra_hosts:
+      - host.docker.internal:host-gateway
+
+  stable24:
+    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-80}:latest
+    environment:
+      SQL: ${SQL:-mysql}
+      NEXTCLOUD_AUTOINSTALL: "YES"
+      NEXTCLOUD_AUTOINSTALL_APPS:
+      WITH_REDIS: "YES"
+      VIRTUAL_HOST: stable24${DOMAIN_SUFFIX}
+      ADDITIONAL_APPS_PATH:
+      NEXTCLOUD_TRUSTED_DOMAINS:
+    volumes:
+      - '${STABLE_ROOT_PATH}/stable24:/var/www/html'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
+      - /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
+    ports:
+      - "${PORTBASE:-800}0:80"
+    depends_on:
+      - ${DB_SERVICE:-database-mysql}
+      - redis
+      - mail
+    extra_hosts:
+      - host.docker.internal:host-gateway
+
+  stable25:
+    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: stable25${DOMAIN_SUFFIX}
+      ADDITIONAL_APPS_PATH:
+      NEXTCLOUD_TRUSTED_DOMAINS:
+    volumes:
+      - '${STABLE_ROOT_PATH}/stable25:/var/www/html'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
+      - /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
+    ports:
+      - "${PORTBASE:-800}0:80"
+    depends_on:
+      - ${DB_SERVICE:-database-mysql}
      - redis
      - mail
    extra_hosts:
@@ -443,6 +520,7 @@ services:
      aliasgroup6: http://stable22${DOMAIN_SUFFIX}
      aliasgroup7: http://stable23${DOMAIN_SUFFIX}
      aliasgroup8: http://stable24${DOMAIN_SUFFIX}
+      aliasgroup9: http://stable25${DOMAIN_SUFFIX}
      dictionaries: de_DE en_US en_GB
      username: admin
      password: admin
@@ -541,14 +619,14 @@ services:
      - clam:/var/lib/clamav

  portal:
-    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-74}:latest
+    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-81}:latest
    environment:
      VIRTUAL_HOST: portal${DOMAIN_SUFFIX}
      SQL: 'mysql'
      GS_MODE: master
    volumes:
-      - '${STABLE_ROOT_PATH:-/home/jus/repos/nextcloud}/server:/var/www/html'
-      - '${STABLE_ROOT_PATH:-/home/jus/repos/nextcloud}/server/apps-extra:/var/www/html/apps-extra'
+      - '${STABLE_ROOT_PATH}/server:/var/www/html'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - /var/www/html/data
      - /var/www/html/config
      - ./data/skeleton/:/skeleton
@@ -563,14 +641,14 @@ services:
      - host.docker.internal:host-gateway

  gs1:
-    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-74}:latest
+    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-81}:latest
    environment:
      VIRTUAL_HOST: gs1${DOMAIN_SUFFIX}
      SQL: 'mysql'
      GS_MODE: slave
    volumes:
-      - '${STABLE_ROOT_PATH:-/home/jus/repos/nextcloud}/server:/var/www/html'
-      - '${STABLE_ROOT_PATH:-/home/jus/repos/nextcloud}/server/apps-extra:/var/www/html/apps-extra'
+      - '${STABLE_ROOT_PATH}/server:/var/www/html'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - /var/www/html/data
      - /var/www/html/config
      - ./data/skeleton/:/skeleton
@@ -586,14 +664,14 @@ services:
      - host.docker.internal:host-gateway

  gs2:
-    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-74}:latest
+    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-81}:latest
    environment:
      VIRTUAL_HOST: gs2${DOMAIN_SUFFIX}
      SQL: 'mysql'
      GS_MODE: slave
    volumes:
-      - '${STABLE_ROOT_PATH:-/home/jus/repos/nextcloud}/server:/var/www/html'
-      - '${STABLE_ROOT_PATH:-/home/jus/repos/nextcloud}/server/apps-extra:/var/www/html/apps-extra'
+      - '${STABLE_ROOT_PATH}/server:/var/www/html'
+      - '${ADDITIONAL_APPS_PATH:-./my-apps}:/var/www/html/apps-extra'
      - /var/www/html/data
      - /var/www/html/config
      - ./data/skeleton/:/skeleton
@@ -613,7 +691,7 @@ services:
    environment:
      VIRTUAL_HOST: "lookup${DOMAIN_SUFFIX}"
    # volumes:
-    #  - '${STABLE_ROOT_PATH:-/home/jus/repos/nextcloud}/lookupserver:/var/www/html'
+    #  - '${STABLE_ROOT_PATH}/lookupserver:/var/www/html'
    extra_hosts:
      - host.docker.internal:host-gateway

@@ -49,11 +49,16 @@ RUN pecl install APCu; \
 	docker-php-source delete && \
 		rm -r /tmp/* /var/cache/*

-# dev tools separate install so we quickly change without rebuilding all php extenions
+# dev tools separate install so we quickly change without rebuilding all php extensions
 RUN apt update && apt-get install -y --no-install-recommends \
    git curl vim sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep \
        && rm -rf /var/lib/apt/lists/*

+# Install PHPUnit
+RUN cd /tmp && curl -L https://phar.phpunit.de/phpunit.phar > phpunit.phar && \
+    chmod +x phpunit.phar && \
+    mv /tmp/phpunit.phar /usr/local/bin/phpunit
+
 RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json

 RUN { \
@@ -49,11 +49,16 @@ RUN pecl install APCu; \
 	docker-php-source delete && \
 		rm -r /tmp/* /var/cache/*

-# dev tools separate install so we quickly change without rebuilding all php extenions
+# dev tools separate install so we quickly change without rebuilding all php extensions
 RUN apt update && apt-get install -y --no-install-recommends \
    git curl vim sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep \
        && rm -rf /var/lib/apt/lists/*

+# Install PHPUnit
+RUN cd /tmp && curl -L https://phar.phpunit.de/phpunit.phar > phpunit.phar && \
+    chmod +x phpunit.phar && \
+    mv /tmp/phpunit.phar /usr/local/bin/phpunit
+
 RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json

 RUN { \
@@ -49,11 +49,16 @@ RUN pecl install APCu; \
 	docker-php-source delete && \
 		rm -r /tmp/* /var/cache/*

-# dev tools separate install so we quickly change without rebuilding all php extenions
+# dev tools separate install so we quickly change without rebuilding all php extensions
 RUN apt update && apt-get install -y --no-install-recommends \
    git curl vim sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep \
        && rm -rf /var/lib/apt/lists/*

+# Install PHPUnit
+RUN cd /tmp && curl -L https://phar.phpunit.de/phpunit.phar > phpunit.phar && \
+    chmod +x phpunit.phar && \
+    mv /tmp/phpunit.phar /usr/local/bin/phpunit
+
 RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json

 RUN { \
@@ -49,11 +49,16 @@ RUN pecl install APCu; \
 	docker-php-source delete && \
 		rm -r /tmp/* /var/cache/*

-# dev tools separate install so we quickly change without rebuilding all php extenions
+# dev tools separate install so we quickly change without rebuilding all php extensions
 RUN apt update && apt-get install -y --no-install-recommends \
    git curl vim sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep \
        && rm -rf /var/lib/apt/lists/*

+# Install PHPUnit
+RUN cd /tmp && curl -L https://phar.phpunit.de/phpunit.phar > phpunit.phar && \
+    chmod +x phpunit.phar && \
+    mv /tmp/phpunit.phar /usr/local/bin/phpunit
+
 RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json

 RUN { \
@@ -49,11 +49,16 @@ RUN pecl install APCu; \
 	docker-php-source delete && \
 		rm -r /tmp/* /var/cache/*

-# dev tools separate install so we quickly change without rebuilding all php extenions
+# dev tools separate install so we quickly change without rebuilding all php extensions
 RUN apt update && apt-get install -y --no-install-recommends \
    git curl vim sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep \
        && rm -rf /var/lib/apt/lists/*

+# Install PHPUnit
+RUN cd /tmp && curl -L https://phar.phpunit.de/phpunit.phar > phpunit.phar && \
+    chmod +x phpunit.phar && \
+    mv /tmp/phpunit.phar /usr/local/bin/phpunit
+
 RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json

 RUN { \
@@ -49,11 +49,16 @@ RUN pecl install APCu; \
 	docker-php-source delete && \
 		rm -r /tmp/* /var/cache/*

-# dev tools separate install so we quickly change without rebuilding all php extenions
+# dev tools separate install so we quickly change without rebuilding all php extensions
 RUN apt update && apt-get install -y --no-install-recommends \
    git curl vim sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep \
        && rm -rf /var/lib/apt/lists/*

+# Install PHPUnit
+RUN cd /tmp && curl -L https://phar.phpunit.de/phpunit.phar > phpunit.phar && \
+    chmod +x phpunit.phar && \
+    mv /tmp/phpunit.phar /usr/local/bin/phpunit
+
 RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json

 RUN { \
@@ -49,11 +49,16 @@ RUN pecl install APCu; \
 	docker-php-source delete && \
 		rm -r /tmp/* /var/cache/*

-# dev tools separate install so we quickly change without rebuilding all php extenions
+# dev tools separate install so we quickly change without rebuilding all php extensions
 RUN apt update && apt-get install -y --no-install-recommends \
    git curl vim sudo cron smbclient iproute2 lnav wget iputils-ping gnupg2 jq ripgrep \
        && rm -rf /var/lib/apt/lists/*

+# Install PHPUnit
+RUN cd /tmp && curl -L https://phar.phpunit.de/phpunit.phar > phpunit.phar && \
+    chmod +x phpunit.phar && \
+    mv /tmp/phpunit.phar /usr/local/bin/phpunit
+
 RUN wget https://gist.githubusercontent.com/nickvergessen/e21ee0a09ee3b3f7fd1b04c83dd3e114/raw/83142be1e50c23e8de1bd7aae88a95e5d6ae1ce2/nextcloud_log.json && lnav -i nextcloud_log.json && rm nextcloud_log.json

 RUN { \
@@ -36,3 +36,12 @@ DOMAIN_SUFFIX=.local
 # May be used to choose database. Both SQL and DB_SERVICE have to be set if used. Defaults to mysql.
 # SQL=pgsql
 # DB_SERVICE=database-postgres
+
+
+# Your server git with your organization or user.
+# Example : https://github.com/nextcloud
+# SERVER_GIT_WITH_ORGANIZATION=""
+
+# You define your apps list to clone.
+# Example: APPS=(viewer recommendations files_pdfviewer profiler)
+# APPS=()
Author	SHA1	Message	Date
Baptiste Fotia	60f5cefc19	feat(sh):Create 2 environment variables I create APPS and SERVER_GIT_WITH_ORGANIZATIO env var when we generate the .env file. Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>	2022-11-08 15:38:57 +01:00
Baptiste Fotia	aac7883609	build(sh): Fix shellchecl add source=/dev/null Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>	2022-11-08 15:38:17 +01:00
Baptiste Fotia	71ff3f9ac0	fix(bash): Declare the source file for shellcheck Please, read the doc : https://www.shellcheck.net/wiki/SC1091 Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>	2022-11-08 11:40:22 +01:00
Baptiste Fotia	440daf474c	fix(bash): Shellcheck compliant I had an error with ShellCheck in the CI. Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>	2022-11-08 11:32:27 +01:00
Baptiste Fotia	7c56999606	chore(): Add the my-apps folder in the gitignore Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>	2022-11-08 11:23:46 +01:00
Baptiste Fotia	cc1d2021c3	feat(yaml,sh,env): Centralise the apps folder This feature centralise the apps folder for the end user (dev). We don't need to clone our apps for each nextcloud releases. Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>	2022-11-08 11:20:35 +01:00
Julius Härtl	dad9f33359	Merge pull request #86 from juliushaertl/feature/update-default-php Update the default release of PHP	2022-10-13 11:10:26 +02:00
Baptiste Fotia	c11df7ec3b	fix(yml):Adapting php release to stable NC version I adapted the php release to stable NC versions. Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>	2022-10-13 11:02:09 +02:00
Baptiste Fotia	24e0fe8c6b	feature(yml): Update the default release of PHP I updated the default release of PHP to be compliant with the official documentation admin : https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html . Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>	2022-10-13 10:24:51 +02:00
Julius Härtl	2cec861c04	Merge pull request #82 from eneiluj/enh/noid/harmonize-docker-compose Add stable25 and harmonize stable* container configs	2022-10-06 09:21:57 +02:00
Julien Veyssier	360460d1dd	add stable25 and harmonize stable* Signed-off-by: Julien Veyssier <eneiluj@posteo.net>	2022-10-05 18:18:14 +02:00
Julius Härtl	abfabbf9fa	Merge pull request #83 from arawa/hotfix/redefine-env refactor(Docker, Bash): Generic env vars	2022-10-05 09:28:29 +02:00
Baptiste Fotia	f0615d4ada	refactor(Docker, Bash): Generic env vars I deleted all values related to Julius' home to make it as generic as possible. In addition, I changed the value of the COMPOSE_PROJECT_NAME env var to target the master branch. Otherwise, we cannot join the development instance with "http://nextcloud.local". Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>	2022-10-04 15:17:03 +02:00
Julius Härtl	ca6cd7ab47	Merge pull request #79 from sylvainmetayer/feat_35_add_phpunit	2022-10-03 11:52:28 +02:00
Sylvain	0a9394970a	feat(35): add phpunit	2022-10-02 19:46:01 +02:00