diff --git a/docmost/.env.example b/docmost/.env.example deleted file mode 100644 index 826133f..0000000 --- a/docmost/.env.example +++ /dev/null @@ -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= \ No newline at end of file diff --git a/docmost/compose.yaml b/docmost/compose.yaml deleted file mode 100644 index 3ba9421..0000000 --- a/docmost/compose.yaml +++ /dev/null @@ -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: {} diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml index 5ada731..fbde7ab 100644 --- a/gitea/docker-compose.yml +++ b/gitea/docker-compose.yml @@ -56,10 +56,19 @@ services: volumes: - runner:/data - /var/run/docker.sock:/var/run/docker.sock + - ./runner-config.yaml:/data/config.yaml:ro environment: - GITEA_INSTANCE_URL=http://server:3000 - GITEA_RUNNER_REGISTRATION_TOKEN=${GITEA_RUNNER_REGISTRATION_TOKEN} - GITEA_RUNNER_NAME=docker-runner + - CONFIG_FILE=/data/config.yaml + command: > + sh -c " + if [ ! -f /data/.runner ]; then + act_runner register --no-interactive --instance http://server:3000 --token $${GITEA_RUNNER_REGISTRATION_TOKEN} --name docker-runner; + fi; + act_runner --config /data/config.yaml daemon + " depends_on: - server labels: diff --git a/gitea/restore.sh b/gitea/restore.sh new file mode 100755 index 0000000..0ebb121 --- /dev/null +++ b/gitea/restore.sh @@ -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." diff --git a/gitea/runner-config.yaml b/gitea/runner-config.yaml new file mode 100644 index 0000000..f949168 --- /dev/null +++ b/gitea/runner-config.yaml @@ -0,0 +1,15 @@ +log: + level: info + +runner: + capacity: 1 + timeout: 3h + +container: + # Use the gitea network so job containers can resolve the 'server' hostname + network: gitea_gitea + privileged: false + options: "" + workdir_parent: "" + valid_volumes: [] + docker_host: "" diff --git a/golinks/docker-compose.yml b/golinks/docker-compose.yml index e209e2b..aaa6b51 100644 --- a/golinks/docker-compose.yml +++ b/golinks/docker-compose.yml @@ -3,6 +3,8 @@ services: container_name: golink restart: unless-stopped image: ghcr.io/tailscale/golink:main + environment: + - TS_AUTHKEY:${TS_AUTHKEY} volumes: - golinks_data:/home/nonroot labels: