From 31b3b64d94f60c86e8fe7e2c7b8c17e263865088 Mon Sep 17 00:00:00 2001 From: Asleep Date: Sun, 26 Oct 2025 14:12:20 -0500 Subject: [PATCH 1/7] fix: lockfile error --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index dbdd8b6c..a41471ad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ WORKDIR /app COPY package.json pnpm-lock.yaml ./ -RUN pnpm install --frozen-lockfile +RUN pnpm install COPY prisma ./prisma/ From e976a8c1f07d1e7822d7138f68c9c16837d0a28c Mon Sep 17 00:00:00 2001 From: Asleep Date: Sun, 26 Oct 2025 14:18:42 -0500 Subject: [PATCH 2/7] add db to compose --- docker-compose.yml | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 617976c3..055f2dae 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,6 +16,40 @@ services: caddy_0: tags.b1.buape.com caddy_0.reverse_proxy: "{{upstreams 8020}}" + db: + image: postgres + restart: always + shm_size: 256mb + environment: + POSTGRES_PASSWORD: ${DB_PASS} + POSTGRES_DB: ${DB_NAME} + POSTGRES_USER: ${DB_USER} + volumes: + - "tags-db:/var/lib/postgresql/data" + ports: + - "41006:5432" + command: ["postgres", "-c", "log_statement=ddl", "-c", "log_destination=stderr"] + + postgres-backup: + image: itbm/postgres-backup-s3 + depends_on: + - db + environment: + - S3_ACCESS_KEY_ID=${R2_ACCESS_KEY_ID} + - S3_SECRET_ACCESS_KEY=${R2_SECRET_ACCESS_KEY} + - S3_BUCKET=db-backups + - S3_PREFIX=tags + - S3_ENDPOINT=${R2_ENDPOINT} + - S3_REGION=auto + - POSTGRES_DATABASE=${DB_NAME} + - POSTGRES_USER=${DB_USER} + - POSTGRES_PASSWORD=${DB_PASS} + - POSTGRES_HOST=db + - SCHEDULE=@hourly + +volumes: + tags-db: + networks: caddy: external: true From fdfe9099c4025f041c566acf0dc17eabb12b4f65 Mon Sep 17 00:00:00 2001 From: Asleep Date: Sun, 26 Oct 2025 14:21:47 -0500 Subject: [PATCH 3/7] add tags network --- docker-compose.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 055f2dae..ad99b6f1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,6 +12,7 @@ services: - PORT=8020 networks: - caddy + - tags labels: caddy_0: tags.b1.buape.com caddy_0.reverse_proxy: "{{upstreams 8020}}" @@ -26,12 +27,16 @@ services: POSTGRES_USER: ${DB_USER} volumes: - "tags-db:/var/lib/postgresql/data" + networks: + - tags ports: - "41006:5432" command: ["postgres", "-c", "log_statement=ddl", "-c", "log_destination=stderr"] postgres-backup: image: itbm/postgres-backup-s3 + networks: + - tags depends_on: - db environment: @@ -53,3 +58,5 @@ volumes: networks: caddy: external: true + tags: + external: true From 46d1264ee9773f3fc18fb357232ddeccd5561a9e Mon Sep 17 00:00:00 2001 From: Asleep Date: Sun, 26 Oct 2025 14:22:55 -0500 Subject: [PATCH 4/7] change db version --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index ad99b6f1..051ddd7d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,7 @@ services: caddy_0.reverse_proxy: "{{upstreams 8020}}" db: - image: postgres + image: postgres:17 restart: always shm_size: 256mb environment: From 6f52ff9542106327463597ca451246187b842c33 Mon Sep 17 00:00:00 2001 From: Asleep Date: Sun, 26 Oct 2025 14:28:07 -0500 Subject: [PATCH 5/7] install openssl i guess --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index a41471ad..f9628e45 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,7 @@ FROM node:20-alpine +RUN apk add --no-cache openssl + RUN npm install -g pnpm WORKDIR /app From 8217717299e54c596f7cc703b5a725512e4863ac Mon Sep 17 00:00:00 2001 From: BuapeBot <119761697+buapebot@users.noreply.github.com> Date: Wed, 25 Feb 2026 12:50:56 -0600 Subject: [PATCH 6/7] chore: use env vars for S3_BUCKET and S3_REGION --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 051ddd7d..70f11551 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -42,10 +42,10 @@ services: environment: - S3_ACCESS_KEY_ID=${R2_ACCESS_KEY_ID} - S3_SECRET_ACCESS_KEY=${R2_SECRET_ACCESS_KEY} - - S3_BUCKET=db-backups + - S3_BUCKET=${S3_BUCKET} - S3_PREFIX=tags - S3_ENDPOINT=${R2_ENDPOINT} - - S3_REGION=auto + - S3_REGION=${S3_REGION} - POSTGRES_DATABASE=${DB_NAME} - POSTGRES_USER=${DB_USER} - POSTGRES_PASSWORD=${DB_PASS} From ec1dbe2d2e58e1e35c12ba4673b7107b185fef6e Mon Sep 17 00:00:00 2001 From: BuapeBot <119761697+buapebot@users.noreply.github.com> Date: Wed, 25 Feb 2026 12:54:57 -0600 Subject: [PATCH 7/7] chore: rename R2 vars to S3 naming convention --- docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 70f11551..04b89e9a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -40,11 +40,11 @@ services: depends_on: - db environment: - - S3_ACCESS_KEY_ID=${R2_ACCESS_KEY_ID} - - S3_SECRET_ACCESS_KEY=${R2_SECRET_ACCESS_KEY} + - S3_ACCESS_KEY_ID=${S3_KEY} + - S3_SECRET_ACCESS_KEY=${S3_PASS} - S3_BUCKET=${S3_BUCKET} - S3_PREFIX=tags - - S3_ENDPOINT=${R2_ENDPOINT} + - S3_ENDPOINT=${S3_ENDPOINT} - S3_REGION=${S3_REGION} - POSTGRES_DATABASE=${DB_NAME} - POSTGRES_USER=${DB_USER}