Refactor Nextcloud.

2023-01-29 00:12:29 -08:00 · 2023-01-29 00:12:29 -08:00 · 361776c25a
parent 1d2402eaba
commit 361776c25a
4 changed files with 222 additions and 7 deletions
--- a/nextcloud/20230128/docker-compose.yml
+++ b/nextcloud/20230128/docker-compose.yml
@ -0,0 +1,93 @@
+version: '3.8'
+
+networks:
+  nextcloud:
+
+services:
+  app:
+    build: /home/robert/nextcloud/nextcloud
+    image: nextcloud:taudris20230113
+    restart: always
+    networks:
+      nextcloud:
+        aliases:
+          - nextcloud.taudris.com
+    ports:
+      - 7980:80
+    volumes:
+      - /etc/nextcloud/files:/var/www/html
+      - /etc/nextcloud/storage:/storage
+    user: 1002:1002 #set to match the user that has permission to the volume mounts
+    environment:
+      OVERWRITEPROTOCOL: https
+      NEXTCLOUD_TRUSTED_DOMAINS: nextcloud.taudris.com
+      NEXTCLOUD_DATA_DIR: /storage
+      NEXTCLOUD_ADMIN_PASSWORD: u8KXCqiZcVBUVr2Wa7EpkuDKPs8KYLb8uFNu3nfBQrxPx3ybUypgDkUVZP3E5v4T
+      POSTGRES_HOST: db
+      POSTGRES_DB: nextcloud
+      POSTGRES_USER: nextcloud
+      POSTGRES_PASSWORD: qe8S4GioPRS2AZWwqLejzoEDNhGsJMrij6TJ4bXxC2XkfvjxNKoqKktvrHEcER6k
+      REDIS_HOST: redis
+      REDIS_HOST_PASSWORD: rYGNbjKkbKjALePfGDyLZ6uNp2UD3U4dGf4SZyL5iWqz3nexdko2HdS9vqDMRWVP
+    depends_on:
+      - db
+      - redis
+
+  collabora:
+    image: collabora/code
+    restart: always
+    networks:
+      nextcloud:
+        aliases:
+          - collabora.taudris.com
+    ports:
+      - 9980:9980
+    environment:
+      username: admin
+      password: 68gfyjs7s7ZoKHjYWHHEJEXLYcTFpQeb5wHv2cp33UW2vv5VKwjZtCmRrNeuCwAR
+      domain: nextcloud.taudris.com #WOPI host
+      dictionaries: en_US
+      #extra_params: "--o:ssl.enable=false"
+      server_name: collabora.taudris.com
+      cert_domain: collabora.taudris.com
+    cap_add:
+      - MKNOD
+    tty: true
+
+  db:
+    image: postgres:15.1
+    restart: always
+    networks:
+      - nextcloud
+    volumes:
+      - /etc/nextcloud/db:/var/lib/postgresql/data
+    user: 1002:1002 #set to match the user that has permission to the volume mounts
+    environment:
+      POSTGRES_DB: nextcloud
+      POSTGRES_USER: nextcloud
+      POSTGRES_PASSWORD: qe8S4GioPRS2AZWwqLejzoEDNhGsJMrij6TJ4bXxC2XkfvjxNKoqKktvrHEcER6k
+
+  redis:
+    image: redis
+    restart: always
+    command: redis-server --requirepass rYGNbjKkbKjALePfGDyLZ6uNp2UD3U4dGf4SZyL5iWqz3nexdko2HdS9vqDMRWVP
+    networks:
+      - nextcloud
+
+#  coturn:
+#    image: instrumentisto/coturn
+#    restart: always
+#    network_mode: host
+#    #networks:
+#    #  - nextcloud
+#    ports:
+#      - "3478:3478/tcp"
+#      - "3478:3478/udp"
+#    command:
+#      - -n
+#      - --log-file=stdout
+#      - --min-port=49160
+#      - --max-port=49200
+#      - --realm=nextcloud.taudris.com
+#      - --use-auth-secret
+#      - --static-auth-secret=RtoRDRtHjmX8tvRcdvL3ncjPcXK5tWSJD4LYf4hiBYWefdHPk7jWvs5foXtYa7bb
--- a/nextcloud/20230128/docker-compose.yml.bak
+++ b/nextcloud/20230128/docker-compose.yml.bak
@ -0,0 +1,93 @@
+version: '3.8'
+
+networks:
+  nextcloud:
+
+services:
+  app:
+    build: /home/robert/nextcloud/nextcloud
+    image: nextcloud:taudris20230113
+    restart: always
+    networks:
+      nextcloud:
+        aliases:
+          - nextcloud.taudris.com
+    ports:
+      - 7980:80
+    volumes:
+      - /etc/nextcloud/files:/var/www/html
+      - /etc/nextcloud/storage:/storage
+    user: 1002:1002 #set to match the user that has permission to the volume mounts
+    environment:
+      OVERWRITEPROTOCOL: https
+      NEXTCLOUD_TRUSTED_DOMAINS: nextcloud.taudris.com
+      NEXTCLOUD_DATA_DIR: /storage
+      NEXTCLOUD_ADMIN_PASSWORD: u8KXCqiZcVBUVr2Wa7EpkuDKPs8KYLb8uFNu3nfBQrxPx3ybUypgDkUVZP3E5v4T
+      POSTGRES_HOST: db
+      POSTGRES_DB: nextcloud
+      POSTGRES_USER: nextcloud
+      POSTGRES_PASSWORD: qe8S4GioPRS2AZWwqLejzoEDNhGsJMrij6TJ4bXxC2XkfvjxNKoqKktvrHEcER6k
+      REDIS_HOST: redis
+      REDIS_HOST_PASSWORD: rYGNbjKkbKjALePfGDyLZ6uNp2UD3U4dGf4SZyL5iWqz3nexdko2HdS9vqDMRWVP
+    depends_on:
+      - db
+      - redis
+
+  collabora:
+    image: collabora/code
+    restart: always
+    networks:
+      nextcloud:
+        aliases:
+          - collabora.taudris.com
+    ports:
+      - 9980:9980
+    environment:
+      username: admin
+      password: 68gfyjs7s7ZoKHjYWHHEJEXLYcTFpQeb5wHv2cp33UW2vv5VKwjZtCmRrNeuCwAR
+      domain: nextcloud.taudris.com #WOPI host
+      dictionaries: en_US
+      #extra_params: "--o:ssl.enable=false"
+      server_name: collabora.taudris.com
+      cert_domain: collabora.taudris.com
+    cap_add:
+      - MKNOD
+    tty: true
+
+  db:
+    image: postgres:14.6
+    restart: always
+    networks:
+      - nextcloud
+    volumes:
+      - /etc/nextcloud/db:/var/lib/postgresql/data
+    user: 1002:1002 #set to match the user that has permission to the volume mounts
+    environment:
+      POSTGRES_DB: nextcloud
+      POSTGRES_USER: nextcloud
+      POSTGRES_PASSWORD: qe8S4GioPRS2AZWwqLejzoEDNhGsJMrij6TJ4bXxC2XkfvjxNKoqKktvrHEcER6k
+
+  redis:
+    image: redis
+    restart: always
+    command: redis-server --requirepass rYGNbjKkbKjALePfGDyLZ6uNp2UD3U4dGf4SZyL5iWqz3nexdko2HdS9vqDMRWVP
+    networks:
+      - nextcloud
+
+#  coturn:
+#    image: instrumentisto/coturn
+#    restart: always
+#    network_mode: host
+#    #networks:
+#    #  - nextcloud
+#    ports:
+#      - "3478:3478/tcp"
+#      - "3478:3478/udp"
+#    command:
+#      - -n
+#      - --log-file=stdout
+#      - --min-port=49160
+#      - --max-port=49200
+#      - --realm=nextcloud.taudris.com
+#      - --use-auth-secret
+#      - --static-auth-secret=RtoRDRtHjmX8tvRcdvL3ncjPcXK5tWSJD4LYf4hiBYWefdHPk7jWvs5foXtYa7bb
--- a/nextcloud/20230128/nextcloud/dockerfile
+++ b/nextcloud/20230128/nextcloud/dockerfile
@ -1,3 +1,3 @@
-FROM nextcloud:apache
+FROM nextcloud:stable-apache

 RUN apt-get update && apt-get install -y procps smbclient && rm -rf /var/lib/apt/lists/*
--- a/nextcloud/docker-compose.yml
+++ b/nextcloud/docker-compose.yml
@ -5,10 +5,7 @@ networks:

 services:
  app:
-    build:
-      context: ./nextcloud
-      dockerfile: ./dockerfile
-    image: nextcloud:taudris20211030
+    image: nextcloud:stable-apache
    restart: always
    networks:
      nextcloud:
@ -16,12 +13,14 @@ services:
          - nextcloud.taudris.com
    ports:
      - 7980:80
+    user: 1002:1002 #set to match the user that has permission to the volume mounts
    volumes:
      - /etc/nextcloud/files:/var/www/html
      - /etc/nextcloud/storage:/storage
-    user: 1002:1002 #set to match the user that has permission to the volume mounts
+      - /etc/localtime:/etc/localtime:ro
    environment:
      OVERWRITEPROTOCOL: https
+      NEXTCLOUD_URL: nextcloud.taudris.com
      NEXTCLOUD_TRUSTED_DOMAINS: nextcloud.taudris.com
      NEXTCLOUD_DATA_DIR: /storage
      NEXTCLOUD_ADMIN_PASSWORD: u8KXCqiZcVBUVr2Wa7EpkuDKPs8KYLb8uFNu3nfBQrxPx3ybUypgDkUVZP3E5v4T
@ -35,6 +34,29 @@ services:
      - db
      - redis

+  cron:
+    image: nextcloud:stable-apache
+    entrypoint: /cron.sh
+    networks:
+      nextcloud:
+    user: 1002:1002 #set to match the user that has permission to the volume mounts
+    volumes:
+      - /etc/nextcloud/files:/var/www/html
+      - /etc/nextcloud/storage:/storage
+      - /etc/localtime:/etc/localtime:ro
+    environment:
+      NEXTCLOUD_DATA_DIR: /storage
+      POSTGRES_HOST: db
+      POSTGRES_DB: nextcloud
+      POSTGRES_USER: nextcloud
+      POSTGRES_PASSWORD: qe8S4GioPRS2AZWwqLejzoEDNhGsJMrij6TJ4bXxC2XkfvjxNKoqKktvrHEcER6k
+      REDIS_HOST: redis
+      REDIS_HOST_PASSWORD: rYGNbjKkbKjALePfGDyLZ6uNp2UD3U4dGf4SZyL5iWqz3nexdko2HdS9vqDMRWVP
+    restart: always
+    depends_on:
+      - db
+      - redis
+
  collabora:
    image: collabora/code
    restart: always
@ -52,17 +74,20 @@ services:
      #extra_params: "--o:ssl.enable=false"
      server_name: collabora.taudris.com
      cert_domain: collabora.taudris.com
+    volumes:
+      - /etc/localtime:/etc/localtime:ro
    cap_add:
      - MKNOD
    tty: true

  db:
-    image: postgres
+    image: postgres:15.1
    restart: always
    networks:
      - nextcloud
    volumes:
      - /etc/nextcloud/db:/var/lib/postgresql/data
+      - /etc/localtime:/etc/localtime:ro
    user: 1002:1002 #set to match the user that has permission to the volume mounts
    environment:
      POSTGRES_DB: nextcloud
@ -75,6 +100,8 @@ services:
    command: redis-server --requirepass rYGNbjKkbKjALePfGDyLZ6uNp2UD3U4dGf4SZyL5iWqz3nexdko2HdS9vqDMRWVP
    networks:
      - nextcloud
+    volumes:
+      - /etc/localtime:/etc/localtime:ro

 #  coturn:
 #    image: instrumentisto/coturn
@ -85,6 +112,8 @@ services:
 #    ports:
 #      - "3478:3478/tcp"
 #      - "3478:3478/udp"
+#    volumes:
+#      - /etc/localtime:/etc/localtime:ro
 #    command:
 #      - -n
 #      - --log-file=stdout