From 3d8bb3f4009dbd3e5536e2d976ebd1fcdb2fc123 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 29 Jan 2025 14:19:07 -0500 Subject: [PATCH 1/3] 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 From 4819cd1605ecd375b6271543548590b172b30e31 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 29 Jan 2025 15:02:34 -0500 Subject: [PATCH 2/3] Forgot a few configs for Nextcloud AIO. --- docker-compose.yml | 33 +++++++-------------------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index eaaf7101..631a456c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3718,54 +3718,35 @@ services: volume: {} nextcloud: container_name: nextcloud - depends_on: - mariadb: - condition: service_started - required: true - restart: true environment: DOCKER_HOST: tcp://dockerproxy:2375 - PGID: ${PGID} - PUID: ${PUID} - TZ: ${TZ} LOG_LEVEL: debug SKIP_DOMAIN_VALIDATION: false APACHE_ADDITIONAL_NETWORK: APACHE_IP_BINDING: 0.0.0.0 APACHE_PORT: 11000 + expose: + - 11000 image: nextcloud/all-in-one:latest labels: homepage.group: Personal Services homepage.name: NextCloud homepage.href: https://cloud.${MY_TLD} - homepage.icon: nextcloud.png + homepage.icon: nextcloud.svg homepage.description: Private Cloud swag: enable + swag_port: 11000 swag_proto: https swag_url: cloud.${MY_TLD} swag.uptime-kuma.enabled: true swag.uptime-kuma.monitor.url: https://cloud.${MY_TLD} - networks: - default: null ports: - - mode: ingress - protocol: tcp - published: "444" - target: 443 + - 56713:8080 restart: unless-stopped volumes: - /etc/localtime:/etc/localtime:ro - - ${DOCKER_VOLUME_CONFIG}/nextcloud:/config - - bind: - create_host_path: true - source: /rinoa-storage - target: /storage - type: bind - - bind: - create_host_path: true - source: ${DOCKER_VOLUME_CONFIG}/nextcloud - target: /data - type: bind + - ${DOCKER_VOLUME_CONFIG}/nextcloud/config:/config + - ${DOCKER_VOLUME_CONFIG}/nextcloud/data:/data ollama: container_name: ollama image: ollama/ollama From 0c8aecf737812ba197e8b4e010389c03a557aa32 Mon Sep 17 00:00:00 2001 From: "Trez.One" Date: Wed, 29 Jan 2025 20:24:29 +0000 Subject: [PATCH 3/3] chore: Update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f9bdaaad..dd00fb9f 100644 --- a/README.md +++ b/README.md @@ -95,7 +95,7 @@ | netbird-coturn | coturn/coturn:latest | | netbox | lscr.io/linuxserver/netbox:latest | | netbox-db | postgres:17-alpine | -| nextcloud | lscr.io/linuxserver/nextcloud:latest | +| nextcloud | nextcloud/all-in-one:latest | | ollama | ollama/ollama | | ombi | lscr.io/linuxserver/ombi:latest | | paperless-ngx | ghcr.io/paperless-ngx/paperless-ngx:latest |