From 3d8bb3f4009dbd3e5536e2d976ebd1fcdb2fc123 Mon Sep 17 00:00:00 2001
From: "Trez.One" <charish.patel@trez.wtf>
Date: Wed, 29 Jan 2025 14:19:07 -0500
Subject: [PATCH] Switching Nextcloud image and tweaking Docker Compose
 deployment in pipeline.

---
 .../workflows/pr-cloudflare-docker-deploy.yml |  3 ++-
 docker-compose.yml                            | 21 +++++++------------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/.gitea/workflows/pr-cloudflare-docker-deploy.yml b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
index 37e2f0a9..4678e4be 100644
--- a/.gitea/workflows/pr-cloudflare-docker-deploy.yml
+++ b/.gitea/workflows/pr-cloudflare-docker-deploy.yml
@@ -290,11 +290,12 @@ jobs:
         continue-on-error: true
         uses: keatonLiu/docker-compose-remote-action@v1.2
         with:
+          docker_compose_file: docker-compose.yml
+          docker_args: -d --remove-orphans --pull missing  --parallel -1
           ssh_user: gitea-deploy
           ssh_host: 192.168.1.254
           ssh_host_public_key: ${{ secrets.RINOA_GITEA_PUBLIC_SSH_KEY }}
           ssh_private_key: ${{ secrets.RINOA_GITEA_PRIVATE_SSH_KEY }}
-          docker_compose_file: docker-compose.yml
       - name: Gotify Notification
         uses: eikendev/gotify-action@master
         with:
diff --git a/docker-compose.yml b/docker-compose.yml
index 110063da..eaaf7101 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3724,12 +3724,16 @@ services:
         required: true
         restart: true
     environment:
+      DOCKER_HOST: tcp://dockerproxy:2375
       PGID: ${PGID}
       PUID: ${PUID}
       TZ: ${TZ}
       LOG_LEVEL: debug
-    hostname: Rinoa
-    image: lscr.io/linuxserver/nextcloud:latest
+      SKIP_DOMAIN_VALIDATION: false
+      APACHE_ADDITIONAL_NETWORK: 
+      APACHE_IP_BINDING: 0.0.0.0
+      APACHE_PORT: 11000
+    image: nextcloud/all-in-one:latest
     labels:
       homepage.group: Personal Services
       homepage.name: NextCloud
@@ -3750,17 +3754,8 @@ services:
         target: 443
     restart: unless-stopped
     volumes:
-      - bind:
-          create_host_path: true
-        read_only: true
-        source: /etc/localtime
-        target: /etc/localtime
-        type: bind
-      - bind:
-          create_host_path: true
-        source: ${DOCKER_VOLUME_CONFIG}/nextcloud
-        target: /config
-        type: bind
+      - /etc/localtime:/etc/localtime:ro
+      - ${DOCKER_VOLUME_CONFIG}/nextcloud:/config
       - bind:
           create_host_path: true
         source: /rinoa-storage