Compare commits
4 Commits
5d46200905
...
8207366362
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8207366362 | ||
|
|
29217e883b | ||
|
|
0f635033c2 | ||
|
|
805559efc3 |
@@ -26,7 +26,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
registry: ${{ env.REGISTRY }}
|
registry: ${{ env.REGISTRY }}
|
||||||
username: ${{ secrets.REGISTRY_USER }}
|
username: ${{ secrets.REGISTRY_USER }}
|
||||||
password: ${{ secrets.REGISTRY_TOKEN }}
|
password: ${{ secrets.REGISTRY_PASSWORD }}
|
||||||
|
|
||||||
- name: Extract metadata
|
- name: Extract metadata
|
||||||
id: meta
|
id: meta
|
||||||
@@ -38,9 +38,12 @@ jobs:
|
|||||||
type=sha,prefix=,suffix=,format=short
|
type=sha,prefix=,suffix=,format=short
|
||||||
|
|
||||||
- name: Build and push
|
- name: Build and push
|
||||||
|
id: docker_build
|
||||||
uses: docker/build-push-action@v5
|
uses: docker/build-push-action@v5
|
||||||
with:
|
with:
|
||||||
context: .
|
context: .
|
||||||
push: true
|
push: true
|
||||||
tags: ${{ steps.meta.outputs.tags }}
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
labels: ${{ steps.meta.outputs.labels }}
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
|
cache-from: type=registry,ref=${{ env.IMAGE }}:cache
|
||||||
|
cache-to: type=registry,ref=${{ env.IMAGE }}:cache,mode=max
|
||||||
|
|||||||
@@ -1,17 +1,16 @@
|
|||||||
##############################################
|
##############################################
|
||||||
# Lageplan — Portainer Stack (Auto-Deploy)
|
# Lageplan — Portainer Stack (Watchtower Auto-Update)
|
||||||
#
|
#
|
||||||
# Setup in Portainer:
|
# Setup in Portainer:
|
||||||
# 1. Stacks → Add Stack → "Repository"
|
# 1. Stacks → Add Stack → "Repository"
|
||||||
# 2. Git-URL: https://git.purepixel.ch/adminpepe/Lageplan.git
|
# 2. Git-URL: https://git.purepixel.ch/adminpepe/Lageplan.git
|
||||||
# 3. Compose-Pfad: docker-compose.portainer.yml
|
# 3. Compose-Pfad: docker-compose.portainer.yml
|
||||||
# 4. "GitOps updates" aktivieren + Webhook kopieren
|
# 4. "GitOps updates" aktivieren
|
||||||
# 5. Webhook in Gitea eintragen (Repo → Einstellungen → Webhooks)
|
# 5. Environment-Variablen setzen (siehe unten)
|
||||||
# 6. Environment-Variablen setzen (siehe unten)
|
# 6. Deploy
|
||||||
# 7. Deploy
|
|
||||||
#
|
#
|
||||||
# Danach: Push auf main → Gitea Actions baut Image →
|
# Danach: Push auf main → Gitea Actions baut Image →
|
||||||
# Portainer Webhook/Watchtower holt neues Image
|
# Watchtower erkennt neues Image und startet Container neu
|
||||||
#
|
#
|
||||||
# Benötigte Environment-Variablen:
|
# Benötigte Environment-Variablen:
|
||||||
# POSTGRES_USER (default: lageplan)
|
# POSTGRES_USER (default: lageplan)
|
||||||
@@ -108,8 +107,11 @@ services:
|
|||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
networks:
|
networks:
|
||||||
- lageplan
|
- lageplan
|
||||||
|
labels:
|
||||||
|
- "com.centurylinklabs.watchtower.enable=true"
|
||||||
|
|
||||||
# ─── Watchtower (Auto-Restart bei neuen Images) ─
|
# ─── Watchtower (Auto-Restart bei neuen Images) ─
|
||||||
|
# Überwacht nur Container mit Label com.centurylinklabs.watchtower.enable=true
|
||||||
watchtower:
|
watchtower:
|
||||||
image: containrrr/watchtower
|
image: containrrr/watchtower
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
@@ -118,7 +120,7 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
WATCHTOWER_POLL_INTERVAL: 60
|
WATCHTOWER_POLL_INTERVAL: 60
|
||||||
WATCHTOWER_CLEANUP: "true"
|
WATCHTOWER_CLEANUP: "true"
|
||||||
WATCHTOWER_LABEL_ENABLE: "false"
|
WATCHTOWER_LABEL_ENABLE: "true"
|
||||||
# Gitea Registry Auth
|
# Gitea Registry Auth
|
||||||
REPO_USER: ${GITEA_REGISTRY_USER}
|
REPO_USER: ${GITEA_REGISTRY_USER}
|
||||||
REPO_PASS: ${GITEA_REGISTRY_PASS}
|
REPO_PASS: ${GITEA_REGISTRY_PASS}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "lageplan",
|
"name": "lageplan",
|
||||||
"version": "1.3.3",
|
"version": "1.3.4",
|
||||||
"description": "Feuerwehr Lageplan - Krokier-App für Einsatzdokumentation",
|
"description": "Feuerwehr Lageplan - Krokier-App für Einsatzdokumentation",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
Reference in New Issue
Block a user