fix: use NAS-local Gitea registry for CRM
Some checks failed
Build & Push Monica Image to Gitea Registry / build-and-push (push) Failing after 7s
Some checks failed
Build & Push Monica Image to Gitea Registry / build-and-push (push) Failing after 7s
This commit is contained in:
@@ -5,10 +5,9 @@ on:
|
|||||||
branches: [main]
|
branches: [main]
|
||||||
|
|
||||||
env:
|
env:
|
||||||
REGISTRY: git.mischlabs.de
|
REGISTRY: localhost:3001
|
||||||
REGISTRY_LAN_IP: 192.168.178.88
|
|
||||||
REGISTRY_USER: MrDiderot
|
REGISTRY_USER: MrDiderot
|
||||||
REGISTRY_IMAGE: git.mischlabs.de/mrdiderot/crm
|
REGISTRY_IMAGE: localhost:3001/mrdiderot/crm
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-and-push:
|
build-and-push:
|
||||||
@@ -45,10 +44,6 @@ jobs:
|
|||||||
- name: Log in to Gitea Package Registry
|
- name: Log in to Gitea Package Registry
|
||||||
shell: sh
|
shell: sh
|
||||||
run: |
|
run: |
|
||||||
if [ -n "${{ env.REGISTRY_LAN_IP }}" ]; then
|
|
||||||
echo "${{ env.REGISTRY_LAN_IP }} ${{ env.REGISTRY }}" >> /etc/hosts
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "${{ secrets.REGISTRY_TOKEN }}" ]; then
|
if [ -z "${{ secrets.REGISTRY_TOKEN }}" ]; then
|
||||||
echo "Missing REGISTRY_TOKEN secret."
|
echo "Missing REGISTRY_TOKEN secret."
|
||||||
echo "Create a Gitea personal access token for MrDiderot with package Read and Write permission."
|
echo "Create a Gitea personal access token for MrDiderot with package Read and Write permission."
|
||||||
|
|||||||
@@ -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`
|
- Gitea repository: `https://git.mischlabs.de/MrDiderot/CRM.git`
|
||||||
- Upstream base: `https://github.com/monicahq/monica`, branch `4.x`
|
- 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`
|
- NAS path: `/volume2/docker/mischcrm`
|
||||||
- Default NAS port: `38090:80`
|
- Default NAS port: `38090:80`
|
||||||
|
|
||||||
## Architecture
|
## 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`: Monica Apache web container
|
||||||
- `mischcrm_cron`: Monica scheduler container using `cron.sh`
|
- `mischcrm_cron`: Monica scheduler container using `cron.sh`
|
||||||
@@ -59,7 +60,7 @@ docker logs mischcrm --tail=120
|
|||||||
|
|
||||||
## Updates
|
## 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:
|
Manual update:
|
||||||
|
|
||||||
@@ -76,7 +77,7 @@ Do not commit `.env`.
|
|||||||
|
|
||||||
Do not delete the Docker volumes unless you explicitly want to remove Monica data.
|
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_URL`
|
||||||
- `APP_TRUSTED_PROXIES=*`
|
- `APP_TRUSTED_PROXIES=*`
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
services:
|
services:
|
||||||
monica:
|
monica:
|
||||||
image: git.mischlabs.de/mrdiderot/crm:latest
|
image: localhost:3001/mrdiderot/crm:latest
|
||||||
container_name: mischcrm
|
container_name: mischcrm
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
env_file:
|
env_file:
|
||||||
@@ -14,7 +14,7 @@ services:
|
|||||||
- monica_storage:/var/www/html/storage
|
- monica_storage:/var/www/html/storage
|
||||||
|
|
||||||
cron:
|
cron:
|
||||||
image: git.mischlabs.de/mrdiderot/crm:latest
|
image: localhost:3001/mrdiderot/crm:latest
|
||||||
container_name: mischcrm_cron
|
container_name: mischcrm_cron
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
command: cron.sh
|
command: cron.sh
|
||||||
|
|||||||
Reference in New Issue
Block a user