From 8195bb8ccf805bbee0fa973de8fbd96d5016e745 Mon Sep 17 00:00:00 2001 From: Kroonk Date: Fri, 22 May 2026 16:53:06 +0200 Subject: [PATCH] fix: use NAS-local Gitea registry for CRM --- .gitea/workflows/docker-build.yml | 9 ++------- MISCHLABS_DEPLOYMENT.md | 9 +++++---- docker-compose.yml | 4 ++-- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.gitea/workflows/docker-build.yml b/.gitea/workflows/docker-build.yml index cf0ce71..034ee2d 100644 --- a/.gitea/workflows/docker-build.yml +++ b/.gitea/workflows/docker-build.yml @@ -5,10 +5,9 @@ on: branches: [main] env: - REGISTRY: git.mischlabs.de - REGISTRY_LAN_IP: 192.168.178.88 + REGISTRY: localhost:3001 REGISTRY_USER: MrDiderot - REGISTRY_IMAGE: git.mischlabs.de/mrdiderot/crm + REGISTRY_IMAGE: localhost:3001/mrdiderot/crm jobs: build-and-push: @@ -45,10 +44,6 @@ jobs: - name: Log in to Gitea Package Registry shell: sh run: | - if [ -n "${{ env.REGISTRY_LAN_IP }}" ]; then - echo "${{ env.REGISTRY_LAN_IP }} ${{ env.REGISTRY }}" >> /etc/hosts - fi - if [ -z "${{ secrets.REGISTRY_TOKEN }}" ]; then echo "Missing REGISTRY_TOKEN secret." echo "Create a Gitea personal access token for MrDiderot with package Read and Write permission." diff --git a/MISCHLABS_DEPLOYMENT.md b/MISCHLABS_DEPLOYMENT.md index e1a6962..fbbb4c6 100644 --- a/MISCHLABS_DEPLOYMENT.md +++ b/MISCHLABS_DEPLOYMENT.md @@ -6,13 +6,14 @@ This repository is the MischLabs fork of Monica CRM, based on the upstream `moni - Gitea repository: `https://git.mischlabs.de/MrDiderot/CRM.git` - Upstream base: `https://github.com/monicahq/monica`, branch `4.x` -- Registry image: `git.mischlabs.de/mrdiderot/crm:latest` +- NAS-internal registry image: `localhost:3001/mrdiderot/crm:latest` +- Public Gitea package UI: `https://git.mischlabs.de/MrDiderot/-/packages/container/crm/latest` - NAS path: `/volume2/docker/mischcrm` - Default NAS port: `38090:80` ## Architecture -The NAS does not build the image locally. Gitea Actions builds the Monica image from `scripts/docker/Dockerfile` and pushes it to the local Gitea registry. The NAS runs: +The NAS does not build the image locally. Gitea Actions builds a MischLabs package image from the official Monica Apache image and pushes it to the local Gitea registry through `localhost:3001`. This avoids Cloudflare upload limits for large Docker layers. The NAS runs: - `mischcrm`: Monica Apache web container - `mischcrm_cron`: Monica scheduler container using `cron.sh` @@ -59,7 +60,7 @@ docker logs mischcrm --tail=120 ## Updates -Watchtower should update `git.mischlabs.de/mrdiderot/crm:latest` automatically after Gitea Actions pushes a new image. +Watchtower should update `localhost:3001/mrdiderot/crm:latest` automatically after Gitea Actions pushes a new image. Manual update: @@ -76,7 +77,7 @@ Do not commit `.env`. Do not delete the Docker volumes unless you explicitly want to remove Monica data. -If Monica redirects incorrectly behind Cloudflare/Nginx Proxy Manager, check: +If Monica redirects incorrectly behind Cloudflare, check: - `APP_URL` - `APP_TRUSTED_PROXIES=*` diff --git a/docker-compose.yml b/docker-compose.yml index a722a49..3758d89 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ services: monica: - image: git.mischlabs.de/mrdiderot/crm:latest + image: localhost:3001/mrdiderot/crm:latest container_name: mischcrm restart: unless-stopped env_file: @@ -14,7 +14,7 @@ services: - monica_storage:/var/www/html/storage cron: - image: git.mischlabs.de/mrdiderot/crm:latest + image: localhost:3001/mrdiderot/crm:latest container_name: mischcrm_cron restart: unless-stopped command: cron.sh