From c15cec654bc90912525923b48a83e1e2bc86aa35 Mon Sep 17 00:00:00 2001 From: Eric McDaniel Date: Tue, 4 Mar 2025 08:40:22 -0500 Subject: [PATCH] chore: pr feedback --- .github/workflows/on_pr.yml | 2 ++ core/app/(user)/login/page.tsx | 1 - docker-compose.preview.yml | 20 ++++---------------- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/.github/workflows/on_pr.yml b/.github/workflows/on_pr.yml index afb661a7c..1a07ccdf9 100644 --- a/.github/workflows/on_pr.yml +++ b/.github/workflows/on_pr.yml @@ -51,6 +51,8 @@ jobs: sed -i "s|image: PLATFORM_IMAGE|image: $PLATFORM_IMAGE|" docker-compose.preview.yml sed -i "s|image: JOBS_IMAGE|image: $JOBS_IMAGE|" docker-compose.preview.yml sed -i "s|image: MIGRATIONS_IMAGE|image: $MIGRATIONS_IMAGE|" docker-compose.preview.yml + sed -i "s|example.com|$PULLPREVIEW_PUBLIC_DNS|" self-host/caddy/Caddyfile + sed -i "s|email someone@example.com|email dev@pubpub.org|" self-host/caddy/Caddyfile - uses: pullpreview/action@v5 with: diff --git a/core/app/(user)/login/page.tsx b/core/app/(user)/login/page.tsx index f66966d4b..9e24d33b3 100644 --- a/core/app/(user)/login/page.tsx +++ b/core/app/(user)/login/page.tsx @@ -29,7 +29,6 @@ export default async function Login({ return (
-

It works!

{/*
Don't have an account?{" "} diff --git a/docker-compose.preview.yml b/docker-compose.preview.yml index 65d80c0f7..935193bef 100644 --- a/docker-compose.preview.yml +++ b/docker-compose.preview.yml @@ -9,36 +9,24 @@ services: MINIO_ROOT_PASSWORD: preview ASSETS_UPLOAD_KEY: preview ASSETS_UPLOAD_SECRET_KEY: preview + ASSETS_STORAGE_ENDPOINT=${PULLPREVIEW_PUBLIC_DNS}/assets platform-jobs: image: JOBS_IMAGE platform-migrations: image: MIGRATIONS_IMAGE + command: ["pnpm", "--filter", "core", "migrate-docker", "&&", "pnpm", "--filter", "core", "reset"] caddy: image: caddy:latest - restart: unless-stopped - command: "caddy reverse-proxy --from '${PULLPREVIEW_PUBLIC_DNS}' --to platform:3000" depends_on: - platform - platform-jobs - minio + env_file: .env ports: - - "80:80" - "443:443" volumes: - - ./caddy:/etc/caddy + - ./self-host/caddy:/etc/caddy - caddy-data:/data - caddy-config:/config networks: - app-network - seed: - platform: linux/amd64 - depends_on: - platform: - condition: service_started - image: ghcr.io/pubpub/platform-migrations:latest - env_file: .env - environment: - DATABASE_URL: postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB} - command: ["pnpm", "--filter", "core", "reset"] - networks: - - app-network