fix(docker): stable24 works with sqlite only

I had problems to work stable24 with mysql. So, I think it's very nice to start stable24 with sqlite which works very well. Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>
Merge pull request #82 from eneiluj/enh/noid/harmonize-docker-compose
2022-10-21 17:55:40 +02:00 · 2022-10-06 09:21:57 +02:00 · 2022-10-05 18:18:14 +02:00 · 2022-10-05 09:28:29 +02:00 · 2022-10-04 15:17:03 +02:00 · 2022-10-03 11:52:28 +02:00
10 changed files with 182 additions and 69 deletions
@@ -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
 ```

@@ -78,7 +78,7 @@ 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
@@ -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}
@@ -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:-./data/apps-extra}:/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
@@ -92,7 +93,7 @@ services:
      SQL: 'mysql'
      VIRTUAL_HOST: "nextcloud2${DOMAIN_SUFFIX}"
    volumes:
-      - '${REPO_PATH_SERVER:-/home/jus/repos/nextcloud/server}:/var/www/html'
+      - '${REPO_PATH_SERVER}:/var/www/html'
      - '${ADDITIONAL_APPS_PATH:-./data/apps-extra}:/var/www/html/apps-extra'
      - ./data/skeleton/:/skeleton
      - ./data/additional.config.php:/var/www/html/config/additional.config.php:ro
@@ -108,10 +109,10 @@ services:
  nextcloud3:
    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-73}:latest
    environment:
-      SQL: 'mysql'
+      SQL: ${SQL:-mysql}
      VIRTUAL_HOST: "nextcloud3${DOMAIN_SUFFIX}"
    volumes:
-      - '${REPO_PATH_SERVER:-/home/jus/repos/nextcloud/server}:/var/www/html'
+      - '${REPO_PATH_SERVER}:/var/www/html'
      - '${ADDITIONAL_APPS_PATH:-./data/apps-extra}:/var/www/html/apps-extra'
      - ./data/skeleton/:/skeleton
      - ./docker/configs/config.php:/var/www/html/config/writable.config.php:ro
@@ -126,7 +127,7 @@ services:
  stable16:
    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-72}:latest
    environment:
-      SQL: 'sqlite'
+      SQL: ${SQL:-mysql}
      NEXTCLOUD_AUTOINSTALL: "YES"
      NEXTCLOUD_AUTOINSTALL_APPS:
      WITH_REDIS: "YES"
@@ -134,14 +135,18 @@ 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'
+      - '${STABLE_ROOT_PATH}/stable16/apps-extra:/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:
@@ -150,7 +155,7 @@ services:
  stable17:
    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-72}:latest
    environment:
-      SQL: 'sqlite'
+      SQL: ${SQL:-mysql}
      NEXTCLOUD_AUTOINSTALL: "YES"
      NEXTCLOUD_AUTOINSTALL_APPS:
      WITH_REDIS: "YES"
@@ -158,14 +163,18 @@ 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'
+      - '${STABLE_ROOT_PATH}/stable17/apps-extra:/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:
@@ -174,7 +183,7 @@ services:
  stable18:
    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"
@@ -182,16 +191,18 @@ 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'
+      - '${STABLE_ROOT_PATH}/stable18/apps-extra:/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:
@@ -200,7 +211,7 @@ services:
  stable19:
    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-72}:latest
    environment:
-      SQL: 'sqlite'
+      SQL: ${SQL:-mysql}
      NEXTCLOUD_AUTOINSTALL: "YES"
      NEXTCLOUD_AUTOINSTALL_APPS:
      WITH_REDIS: "YES"
@@ -208,11 +219,18 @@ 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'
+      - '${STABLE_ROOT_PATH}/stable19/apps-extra:/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:
@@ -221,7 +239,7 @@ services:
  stable20:
    image: ghcr.io/juliushaertl/nextcloud-dev-php${PHP_VERSION:-72}:latest
    environment:
-      SQL: 'sqlite'
+      SQL: ${SQL:-mysql}
      NEXTCLOUD_AUTOINSTALL: "YES"
      NEXTCLOUD_AUTOINSTALL_APPS:
      WITH_REDIS: "YES"
@@ -229,11 +247,18 @@ 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'
+      - '${STABLE_ROOT_PATH}/stable20/apps-extra:/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:
@@ -242,7 +267,7 @@ services:
  stable21:
    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"
@@ -250,11 +275,18 @@ 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'
+      - '${STABLE_ROOT_PATH}/stable21/apps-extra:/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:
@@ -263,7 +295,7 @@ services:
  stable22:
    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"
@@ -271,37 +303,18 @@ 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'
+      - '${STABLE_ROOT_PATH}/stable22/apps-extra:/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:
@@ -310,7 +323,7 @@ services:
  stable23:
    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"
@@ -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'
+      - '${STABLE_ROOT_PATH}/stable23/apps-extra:/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:-74}:latest
+    environment:
+      SQL: 'sqlite'
+      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'
+      - '${STABLE_ROOT_PATH}/stable24/apps-extra:/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:-74}: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'
+      - '${STABLE_ROOT_PATH}/stable25/apps-extra:/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
@@ -547,8 +625,8 @@ services:
      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'
+      - '${STABLE_ROOT_PATH}/server/apps-extra:/var/www/html/apps-extra'
      - /var/www/html/data
      - /var/www/html/config
      - ./data/skeleton/:/skeleton
@@ -569,8 +647,8 @@ services:
      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'
+      - '${STABLE_ROOT_PATH}/server/apps-extra:/var/www/html/apps-extra'
      - /var/www/html/data
      - /var/www/html/config
      - ./data/skeleton/:/skeleton
@@ -592,8 +670,8 @@ services:
      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'
+      - '${STABLE_ROOT_PATH}/server/apps-extra:/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 { \
Author	SHA1	Message	Date
Baptiste Fotia	e60bb4454e	fix(docker): stable24 works with sqlite only I had problems to work stable24 with mysql. So, I think it's very nice to start stable24 with sqlite which works very well. Signed-off-by: Baptiste Fotia <fotia.baptiste@hotmail.com>	2022-10-21 17:55:40 +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