9 Commits

Author SHA1 Message Date
Peter Wood
e25bc33867 udpated to remove tar.gz and *.db files. removed stirling files since I changed to bentopdf 2025-12-01 07:31:05 -08:00
Peter Wood
c49df33972 stop tracking dockge/data directory 2025-12-01 07:28:17 -08:00
Peter Wood
43e2dfe9cc updated pangolin version 2025-12-01 07:25:03 -08:00
Peter Wood
d183005140 Merge branch 'master' of https://github.com/acedanger/docker 2025-12-01 10:18:18 -05:00
Peter Wood
8988f05c85 updated external flag on volumes after the migration from original racknerd VPS 2025-12-01 10:17:56 -05:00
Peter Wood
babf61b697 added TS_AUTHKEY environment variable 2025-12-01 04:17:53 -08:00
Peter Wood
75d48204ba removed docmost 2025-11-30 16:06:48 -08:00
Peter Wood
255b977aad Add restore script for Gitea, DB, and Runner data 2025-11-30 04:52:13 -08:00
Peter Wood
ce5f3af384 network_mode usage is discontinued in favor of network 2025-11-11 12:12:37 -05:00
13 changed files with 43 additions and 57 deletions

14
.gitignore vendored
View File

@@ -21,12 +21,6 @@ nginxproxymanager/mysql
opengist/opengist-database opengist/opengist-database
papra/app-data/ papra/app-data/
# stirling
pdf/stirling/latest/data/
pdf/stirling/latest/logs/
pdf/stirling/latest/config/db/backup/
pdf/stirling/latest/config/*.db
# beszel # beszel
beszel/beszel_data/* beszel/beszel_data/*
beszel/beszel_data/auxiliary.db beszel/beszel_data/auxiliary.db
@@ -44,3 +38,11 @@ pangolin/config/traefik-dashboard/dashboard/*.db-wal
pangolin/config/traefik/logs/access.log pangolin/config/traefik/logs/access.log
pangolin/config/traefik-dashboard/dashboard/*.db pangolin/config/traefik-dashboard/dashboard/*.db
pangolin/config/traefik-dashboard/dashboard/*.db-shm pangolin/config/traefik-dashboard/dashboard/*.db-shm
dockge/data/
gitea/app.ini
gitea/database.sql
gitea/*.tar.gz
golinks/golink.db

View File

@@ -1,3 +0,0 @@
{
"type": "sqlite"
}

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -1,7 +0,0 @@
# openssl rand -base64 18
POSTGRES_PASSWORD=
POSTGRES_URL=postgresql://docmost:password@db:5432/docmost?schema=public
# Application Configuration
# openssl rand -base64 33
APP_SECRET=

View File

@@ -1,35 +0,0 @@
services:
docmost:
image: docmost/docmost:latest
depends_on:
- db
- redis
environment:
APP_URL: http://localhost:3000
APP_SECRET: ${APP_SECRET}
DATABASE_URL: ${POSTGRES_URL}
REDIS_URL: redis://redis:6379
ports:
- 9380:3000
restart: unless-stopped
volumes:
- docmost:/app/data/storage
db:
image: postgres:16-alpine
environment:
POSTGRES_DB: docmost
POSTGRES_USER: docmost
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
restart: unless-stopped
volumes:
- db_data:/var/lib/postgresql/data
redis:
image: redis:7.2-alpine
restart: unless-stopped
volumes:
- redis_data:/data
volumes:
docmost: null
db_data: null
redis_data: null
networks: {}

24
gitea/restore.sh Executable file
View File

@@ -0,0 +1,24 @@
#!/bin/bash
# RESTORE SCRIPT
echo "WARNING: This will overwrite your current Gitea/DB/Runner data."
read -p "Are you sure? (y/N): " -n 1 -r
echo
if [[ ! $REPLY =~ ^[Yy]$ ]]; then exit 1; fi
docker compose down
echo "Restoring Database Volume..."
docker compose up -d db
echo "Waiting for DB to initialize..."
sleep 15
cat database.sql | docker compose exec -T db psql -U ${POSTGRES_USER:-gitea} -d ${POSTGRES_DB:-gitea}
echo "Restoring Gitea Files..."
docker run --rm --volumes-from gitea -v $(pwd):/backup alpine tar xzf /backup/gitea_data.tar.gz -C /data
echo "Restoring Runner Files..."
docker run --rm --volumes-from gitea-runner -v $(pwd):/backup alpine tar xzf /backup/runner_data.tar.gz -C /data
echo "Restarting stack..."
docker compose up -d
echo "Restore Complete."

View File

@@ -7,7 +7,7 @@ runner:
container: container:
# Use the gitea network so job containers can resolve the 'server' hostname # Use the gitea network so job containers can resolve the 'server' hostname
network_mode: gitea_gitea network: gitea_gitea
privileged: false privileged: false
options: "" options: ""
workdir_parent: "" workdir_parent: ""

View File

@@ -3,6 +3,8 @@ services:
container_name: golink container_name: golink
restart: unless-stopped restart: unless-stopped
image: ghcr.io/tailscale/golink:main image: ghcr.io/tailscale/golink:main
environment:
- TS_AUTHKEY:${TS_AUTHKEY}
volumes: volumes:
- golinks_data:/home/nonroot - golinks_data:/home/nonroot
labels: labels:

View File

@@ -1,7 +1,7 @@
name: pangolin name: pangolin
services: services:
pangolin: pangolin:
image: fosrl/pangolin:1.12.1 image: fosrl/pangolin:1.12.2
container_name: pangolin container_name: pangolin
restart: unless-stopped restart: unless-stopped
labels: labels:
@@ -41,7 +41,7 @@ services:
- 21820:21820/udp # port for ACCEPT_CLIENTS env variable - 21820:21820/udp # port for ACCEPT_CLIENTS env variable
- 443:443 # Port for traefik because of the network_mode - 443:443 # Port for traefik because of the network_mode
- 80:80 # Port for traefik because of the network_mode - 80:80 # Port for traefik because of the network_mode
- 2229:2229 # port for gitea, served from europa; git.ptrwd.com # - 2229:2229 # port for gitea, served from a; git.ptrwd.com
- 5432:5432 # port for postgres, served from io - 5432:5432 # port for postgres, served from io
traefik: traefik:
image: traefik:v3 image: traefik:v3
@@ -66,7 +66,7 @@ services:
labels: labels:
- diun.enable=true - diun.enable=true
ports: ports:
- "5000:5000" - 5000:5000
volumes: volumes:
- ./config/traefik/logs:/logs:ro - ./config/traefik/logs:/logs:ro
- ./config/traefik-dashboard/geoip:/geoip:ro - ./config/traefik-dashboard/geoip:/geoip:ro
@@ -94,7 +94,7 @@ services:
labels: labels:
- diun.enable=true - diun.enable=true
ports: ports:
- "3005:3000" - 3005:3000
volumes: volumes:
- ./config/traefik-dashboard/dashboard:/app/data - ./config/traefik-dashboard/dashboard:/app/data
environment: environment:

View File

@@ -19,3 +19,4 @@ services:
volumes: volumes:
vaultwarden_data: vaultwarden_data:
name: vaultwarden_data name: vaultwarden_data
external: true

View File

@@ -27,5 +27,7 @@ services:
labels: labels:
- diun.enable=true - diun.enable=true
volumes: volumes:
db-data: null db-data:
name: wiki_db-data
external: true
networks: {} networks: {}