Update Convex with no payload to be just like convex with payload but without payload

2026-06-21 15:35:42 -05:00
parent 13b8b36c4c
commit fba73a92ce
130 changed files with 15637 additions and 32018 deletions
@@ -1,39 +0,0 @@
-# Next Envrionment Variables
-NETWORK=nginx-bridge
-NEXT_CONTAINER_NAME=next-app
-NEXT_DOMAIN_NAME=gbrown.org
- NEXT_PORT=3000
-NODE_ENV=production
-SENTRY_AUTH_TOKEN=
-NEXT_PUBLIC_SITE_URL=https://gbrown.org
-NEXT_PUBLIC_CONVEX_URL=https://api.convex.gbrown.org
-NEXT_PUBLIC_PLAUSIBLE_URL=https://plausible.gbrown.org
-NEXT_PUBLIC_SENTRY_DSN=
-NEXT_PUBLIC_SENTRY_ORG=sentry
-NEXT_PUBLIC_SENTRY_PROJECT_NAME=
-
-# Convex Environment Variables
-BACKEND_TAG=latest
-BACKEND_CONTAINER_NAME=convex-backend
-BACKEND_DOMAIN_NAME=convex.gbrown.org
-#BACKEND_PORT=
-#SITE_PROXY_PORT=
-DASHBOARD_TAG=latest
-DASHBOARD_CONTAINER_NAME=convex-dashboard
-DASHBOARD_DOMAIN=dashboard.convex.gbrown.org
-#DASHBOARD_PORT
-INSTANCE_NAME=convex
-#INSTANCE_SECRET=
-CONVEX_CLOUD_ORIGIN=https://api.convex.gbrown.org
-CONVEX_SITE_ORIGIN=https://convex.gbrown.org
-DISABLE_BEACON=true
-REDACT_LOGS_TO_CLIENT=true
-DO_NOT_REQUIRE_SSL=true
-NEXT_PUBLIC_DEPLOYMENT_URL=https://api.convex.gbrown.org
-#POSTGRES_URL=
-#DATABASE_URL=
-#CONVEX_RELEASE_VERSION_DEV=
-#ACTIONS_USER_TIMEOUT_SECS=
-#MYSQL_URL=
-#RUST_LOG=
-#RUST_BACKTRACE=
@@ -1,24 +1,45 @@
 # syntax=docker/dockerfile:1
-FROM oven/bun:alpine AS base
+FROM docker.io/oven/bun:1.3.10-alpine AS base

 # Builder stage
 FROM base AS builder
 RUN apk add --no-cache libc6-compat
 WORKDIR /app

+ARG SENTRY_AUTH_TOKEN
+ARG SENTRY_DISABLE_AUTO_UPLOAD=false
+ARG NEXT_PUBLIC_SITE_URL
+ARG NEXT_PUBLIC_CONVEX_URL
+ARG NEXT_PUBLIC_PLAUSIBLE_URL
+ARG NEXT_PUBLIC_SENTRY_DSN
+ARG NEXT_PUBLIC_SENTRY_URL
+ARG NEXT_PUBLIC_SENTRY_ORG
+ARG NEXT_PUBLIC_SENTRY_PROJECT_NAME
+
+ENV SENTRY_AUTH_TOKEN=$SENTRY_AUTH_TOKEN
+ENV SENTRY_DISABLE_AUTO_UPLOAD=$SENTRY_DISABLE_AUTO_UPLOAD
+ENV NEXT_PUBLIC_SITE_URL=$NEXT_PUBLIC_SITE_URL
+ENV NEXT_PUBLIC_CONVEX_URL=$NEXT_PUBLIC_CONVEX_URL
+ENV NEXT_PUBLIC_PLAUSIBLE_URL=$NEXT_PUBLIC_PLAUSIBLE_URL
+ENV NEXT_PUBLIC_SENTRY_DSN=$NEXT_PUBLIC_SENTRY_DSN
+ENV NEXT_PUBLIC_SENTRY_URL=$NEXT_PUBLIC_SENTRY_URL
+ENV NEXT_PUBLIC_SENTRY_ORG=$NEXT_PUBLIC_SENTRY_ORG
+ENV NEXT_PUBLIC_SENTRY_PROJECT_NAME=$NEXT_PUBLIC_SENTRY_PROJECT_NAME
+
 # Copy source code (node_modules excluded via .dockerignore)
 COPY . .

 # Install all dependencies
-RUN bun install
+ENV HUSKY=0
+RUN bun install --frozen-lockfile

 # Build with proper environment
 ENV NEXT_TELEMETRY_DISABLED=1
 ENV NODE_ENV=production
-RUN bun run build --filter=@gib/next
+RUN cd apps/next && bun run build:docker

 # Runner stage
-FROM node:22-alpine AS runner
+FROM docker.io/library/node:22-alpine AS runner
 WORKDIR /app

 ENV NODE_ENV=production
@@ -0,0 +1,44 @@
+name: convexmonorepo-local
+
+services:
+  convex-backend:
+    image: ghcr.io/get-convex/convex-backend:${BACKEND_TAG:-latest}
+    container_name: convexmonorepo-local-convex
+    ports:
+      - '${BACKEND_PORT:-3210}:3210'
+      - '${SITE_PROXY_PORT:-3211}:3211'
+    environment:
+      - INSTANCE_NAME=${LOCAL_INSTANCE_NAME:-convexmonorepo_local}
+      - INSTANCE_SECRET=${LOCAL_INSTANCE_SECRET:-0000000000000000000000000000000000000000000000000000000000000000}
+      - CONVEX_CLOUD_ORIGIN=http://localhost:${BACKEND_PORT:-3210}
+      - CONVEX_SITE_ORIGIN=http://localhost:${SITE_PROXY_PORT:-3211}
+      - DISABLE_BEACON=true
+      - REDACT_LOGS_TO_CLIENT=false
+      - DO_NOT_REQUIRE_SSL=true
+      # Convex uses its own volume by default. A cloned project may opt into
+      # Convex-on-Postgres by configuring a separate database URL here:
+      # - POSTGRES_URL=postgres://user:password@postgres:5432/convex?sslmode=disable
+    volumes: [convex-data:/convex/data]
+    restart: unless-stopped
+    healthcheck:
+      test: ['CMD', 'curl', '-f', 'http://localhost:3210/version']
+      start_period: 10s
+      interval: 5s
+      retries: 20
+      timeout: 5s
+    stop_grace_period: 10s
+    stop_signal: SIGINT
+
+  convex-dashboard:
+    image: ghcr.io/get-convex/convex-dashboard:${DASHBOARD_TAG:-latest}
+    container_name: convexmonorepo-local-convex-dashboard
+    ports: ['${DASHBOARD_PORT:-6791}:6791']
+    environment:
+      - NEXT_PUBLIC_DEPLOYMENT_URL=http://localhost:${BACKEND_PORT:-3210}
+    depends_on:
+      convex-backend:
+        condition: service_healthy
+    restart: unless-stopped
+
+volumes:
+  convex-data:
@@ -3,14 +3,25 @@ networks:
    external: true

 services:
-  next-app:
+  convexmonorepo-next:
    build:
      context: ../
      dockerfile: ./docker/Dockerfile
-    image: ${NEXT_CONTAINER_NAME}:alpine
+      args:
+        SENTRY_AUTH_TOKEN: ${SENTRY_AUTH_TOKEN}
+        SENTRY_DISABLE_AUTO_UPLOAD: ${SENTRY_DISABLE_AUTO_UPLOAD:-false}
+        NEXT_PUBLIC_SITE_URL: ${NEXT_PUBLIC_SITE_URL}
+        NEXT_PUBLIC_CONVEX_URL: ${NEXT_PUBLIC_CONVEX_URL}
+        NEXT_PUBLIC_PLAUSIBLE_URL: ${NEXT_PUBLIC_PLAUSIBLE_URL}
+        NEXT_PUBLIC_SENTRY_DSN: ${NEXT_PUBLIC_SENTRY_DSN}
+        NEXT_PUBLIC_SENTRY_URL: ${NEXT_PUBLIC_SENTRY_URL}
+        NEXT_PUBLIC_SENTRY_ORG: ${NEXT_PUBLIC_SENTRY_ORG}
+        NEXT_PUBLIC_SENTRY_PROJECT_NAME: ${NEXT_PUBLIC_SENTRY_PROJECT_NAME}
+    image: convexmonorepo-next:latest
+    #image: git.gbrown.org/gib/${NEXT_CONTAINER_NAME}:latest
    container_name: ${NEXT_CONTAINER_NAME}
    environment:
-      - NODE_ENV
+      - NODE_ENV=${NODE_ENV}
      - SENTRY_AUTH_TOKEN=${SENTRY_AUTH_TOKEN}
      - NEXT_PUBLIC_SITE_URL=${NEXT_PUBLIC_SITE_URL:-http://localhost:${NEXT_PORT:-3000}}
      - NEXT_PUBLIC_CONVEX_URL=${NEXT_PUBLIC_CONVEX_URL:-http://${BACKEND_CONTAINER_NAME:-convex-backend}:${BACKEND_PORT:-3210}}
@@ -20,33 +31,34 @@ services:
      - NEXT_PUBLIC_SENTRY_ORG=${NEXT_PUBLIC_SENTRY_ORG:-sentry}
      - NEXT_PUBLIC_SENTRY_PROJECT_NAME=${NEXT_PUBLIC_SENTRY_PROJECT_NAME}
    hostname: ${NEXT_CONTAINER_NAME}
-    domainname: ${NEXT_DOMAIN_NAME}
+    domainname: ${NEXT_DOMAIN}
    networks: ['${NETWORK:-nginx-bridge}']
-    #ports: ['${NEXT_PORT}:3000']
-    depends_on: ['convex-backend']
+    #ports: ['${NEXT_PORT}:${NEXT_PORT}']
+    #depends_on: ['convexmonorepo-backend']
    tty: true
    stdin_open: true
    restart: unless-stopped

-  convex-backend:
+  convexmonorepo-backend:
    image: ghcr.io/get-convex/convex-backend:${BACKEND_TAG:-latest}
    container_name: ${BACKEND_CONTAINER_NAME:-convex-backend}
    hostname: ${BACKEND_CONTAINER_NAME:-convex-backend}
-    domainname: ${BACKEND_DOMAIN_NAME:-convex.gbrown.org}
+    domainname: ${BACKEND_DOMAIN:-convex.gbrown.org}
    networks: ['${NETWORK:-nginx-bridge}']
    #user: '1000:1000'
    #ports: ['${BACKEND_PORT:-3210}:3210','${SITE_PROXY_PORT:-3211}:3211']
    volumes: [./data:/convex/data]
    labels: ['com.centurylinklabs.watchtower.enable=true']
    environment:
-      - INSTANCE_NAME
-      - INSTANCE_SECRET
-      - CONVEX_CLOUD_ORIGIN=${CONVEX_CLOUD_ORIGIN:-http://${BACKEND_CONTAINER_NAME:-convex-backend}:${BACKEND_PORT:-3210}}
-      - CONVEX_SITE_ORIGIN=${CONVEX_SITE_ORIGIN:-http://${BACKEND_CONTAINER_NAME:-convex-backend}:${SITE_PROXY_PORT:-3211}}
-      - DISABLE_BEACON
-      - REDACT_LOGS_TO_CLIENT
-      - DO_NOT_REQUIRE_SSL
-      #- DATABASE_URL=${DATABASE_URL:-}
+      - INSTANCE_NAME=${INSTANCE_NAME}
+      - INSTANCE_SECRET=${INSTANCE_SECRET}
+      - CONVEX_CLOUD_ORIGIN=${CONVEX_CLOUD_ORIGIN:-http://${BACKEND_CONTAINER_NAME:-stpeteit-backend}:${BACKEND_PORT:-3210}}
+      - CONVEX_SITE_ORIGIN=${CONVEX_SITE_ORIGIN:-http://${BACKEND_CONTAINER_NAME:-stpeteit-backend}:${SITE_PROXY_PORT:-3211}}
+      - DISABLE_BEACON=${DISABLE_BEACON:-true}
+      - REDACT_LOGS_TO_CLIENT=${REDACT_LOGS_TO_CLIENT:-true}
+      - DO_NOT_REQUIRE_SSL=${DO_NOT_REQUIRE_SSL:-false}
+      # Optional: Convex-on-Postgres is not the template default.
+      #- POSTGRES_URL=${POSTGRES_URL}
    stdin_open: true
    tty: true
    restart: unless-stopped
@@ -57,11 +69,11 @@ services:
    stop_grace_period: 10s
    stop_signal: SIGINT

-  convex-dashboard:
+  convexmonorepo-dashboard:
    image: ghcr.io/get-convex/convex-dashboard:${DASHBOARD_TAG:-latest}
    container_name: ${DASHBOARD_CONTAINER_NAME:-convex-dashboard}
    hostname: ${DASHBOARD_CONTAINER_NAME:-convex-dashboard}
-    domainname: ${DASHBOARD_DOMAIN_NAME:-dashboard.${BACKEND_DOMAIN_NAME:-convex.gbrown.org}}
+    domainname: ${DASHBOARD_DOMAIN:-dashboard.${BACKEND_DOMAIN:-convex.gbrown.org}}
    networks: ['${NETWORK:-nginx-bridge}']
    #user: 1000:1000
    #ports: ['${DASHBOARD_PORT:-6791}:6791']
@@ -69,7 +81,7 @@ services:
    environment:
      - NEXT_PUBLIC_DEPLOYMENT_URL=${NEXT_PUBLIC_DEPLOYMENT_URL:-http://${BACKEND_CONTAINER_NAME:-convex-backend}:${PORT:-3210}}
    depends_on:
-      convex-backend:
+      convexmonorepo-backend:
        condition: service_healthy
    stdin_open: true
    tty: true
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-source ./.env
-sudo docker compose exec ${BACKEND_CONTAINER_NAME} ./generate_admin_key.sh