Merge pull request #62 from fatfingers23/docker

Feature: Dev docker compose

.env.template

···
+#Aqua setup
+NODE_ENV=development
+PORT=3000
+HOST=0.0.0.0
+PUBLIC_URL=A publicly accessible url for aqua
+DB_USER=postgres
+DB_PASSWORD=supersecurepassword123987
+DB_NAME=teal
+DATABASE_URL="postgresql://${DB_USER}:${DB_PASSWORD}@localhost:5432/${DB_NAME}"
+DOCKER_DB_URL="postgresql://${DB_USER}:${DB_PASSWORD}@host.docker.internal:5432/${DB_NAME}"
+#This is not currently being used fully so can just use this default pubkey for now
+DID_WEB_PUBKEY=zQ3sheEnMKhEK87PSu4P2mjAevViqHcjKmgxBWsDQPjLRM9wP
+CLIENT_ADDRESS=A publicly accessible host for amethyst like amethyst.teal.fm
+PUBLIC_DID_WEB=did:web:{aqua's PUBLIC_URL goes here after did:web:}
+
+#amethyst
+EXPO_PUBLIC_DID_WEB=same as PUBLIC_DID_WEB
+EXPO_PUBLIC_BASE_URL=same as CLIENT_ADDRESS but with http scheme like https://amethyst.teal.fm

.gitignore

···
 .env.development.local
 .env.test.local
 .env.production.local
+.env.air
 
 # vercel
 .vercel
···
 **/*.log
 package-lock.json
 **/*.bun
+.idea

README.md

···
 ```
 
 Open http://localhost:3000/ with your browser to see the home page. You will need to login with Bluesky to test the posting functionality of the app. Note: if the redirect back to the app after you login isn't working correctly, you may need to replace the `127.0.0.1` with `localhost`.
+
+
+### Running the full stack in docker for development
+_Still a work in progress and may have some hiccups_
+
+#### 1. Set up publicly accessible endpoints. 
+It is recommended if you are running aqua to make a publicly accessible endpoint for the app to post to. You can do that a couple of ways:
+
+* Set up the traditional port forward on your router 
+* Use a tool like [ngrok](https://ngrok.com/) with the command `ngrok http 8080` or [Cloudflare tunnels](https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/get-started/create-remote-tunnel/) (follow the 2a. portion of the guide when you get to that point).
+
+If you do the cloudflare tunnels for amethyst as well,
+you will also need
+to follow [this](https://caddy.community/t/caddy-with-cloudflare-tunnel/18569) for routing to work properly.
+Although you can just run it locally and it will work.
+
+#### 2. Set up .envs
+1. copy [.env.template](.env.template) and name it [.env](.env). The docker build will pull everything from this `.env`. There are notes in the [.env.template](.env.template) on what some of the values should be.
+2. Follow the instructions in [piper](https://github.com/teal-fm/piper) to set up environment variables for the music scraper. But name it `.env.air`
+
+#### 3. Run docker
+1. Make sure docker and docker compose is installed
+2. It is recommended to run 'docker compose -f compose.dev.yml pull' to pull the latest remote images before running the docker compose command.
+3. Run `docker compose -f compose.dev.yml up -d`
+
+
+And that's it! You should have the full teal.fm stack running locally. Now if you are working on aqua you can do `docker container stop aqua-app` and run that locally during development while everything else is running in docker.
+

apps/amethyst/.env.template

···
+EXPO_PUBLIC_DID_WEB=did:web:your.publicly-accessible-aqua-domain.com

apps/amethyst/Caddyfile

···
+{env.CLIENT_ADDRESS} {
+    try_files {path} /index.html
+    file_server
+}
+

apps/amethyst/Dockerfile

···
+FROM node:22-slim AS builder
+ARG CLIENT_ADDRESS
+
+ENV PNPM_HOME="/pnpm"
+ENV PATH="$PNPM_HOME:$PATH"
+RUN corepack enable
+# Set working directory
+WORKDIR /app
+
+# Copy root workspace files
+COPY package.json pnpm-workspace.yaml pnpm-lock.yaml ./
+
+# Copy turbo.json
+COPY turbo.json ./
+
+# Copy workspace packages
+COPY packages/db/ ./packages/db/
+COPY packages/lexicons/ ./packages/lexicons/
+COPY packages/tsconfig/ ./packages/tsconfig/
+
+# Copy the aqua app
+COPY apps/amethyst/ ./apps/amethyst/
+
+# Copy .env
+COPY ../../.env ./apps/amethyst/.env
+
+# Build the aqua app
+WORKDIR /app/apps/amethyst
+RUN pnpm install
+RUN pnpm run build:web
+
+#create the client-json
+RUN echo '{ \
+            "redirect_uris": ["https://'"${CLIENT_ADDRESS}"'/auth/callback"], \
+            "response_types": ["code"], \
+            "grant_types": ["authorization_code", "refresh_token"], \
+            "scope": "atproto transition:generic", \
+            "token_endpoint_auth_method": "none", \
+            "application_type": "web", \
+            "client_id": "https://'"${CLIENT_ADDRESS}"'/client-metadata.json", \
+            "client_name": "teal", \
+            "client_uri": "https://'"${CLIENT_ADDRESS}"'", \
+            "dpop_bound_access_tokens": true \
+          }' > /app/client-metadata.json \
+
+
+FROM caddy:2.1.0-alpine AS caddy
+EXPOSE 80
+EXPOSE 443
+EXPOSE 443/udp
+COPY /apps/amethyst/Caddyfile /etc/caddy/Caddyfile
+COPY --from=builder /app/apps/amethyst/build /srv
+COPY --from=builder /app/client-metadata.json /srv/client-metadata.json

apps/amethyst/package.json

···
     "ios": "expo run:ios",
     "web": "expo start --web",
     "build": "expo export --output-dir ./build --platform all",
+    "build:web": "expo export --output-dir ./build --platform web --clear",
     "test": "jest --watchAll",
     "lexgen": "lex gen-server ./lexicons/generated/server/ ./lexicons/src/"
   },

apps/amethyst/readme.md

···
 
 ## Development
 
+Copy the [.env.template](.env.template) and name it `.env`
+
+set `EXPO_PUBLIC_DID_WEB` to the domain aqua is running on.
+For example if it's running at `aqua.teal.fm` it would be
+`EXPO_PUBLIC_DID_WEB=did:web:aqua.teal.fm`. This is how amethyst sends requests to the appview. 
+
 TODO

apps/amethyst/stores/authenticationSlice.tsx

···
 ) => {
   // check if we have CF_PAGES_URL set. if not, use localhost
   const baseUrl = process.env.EXPO_PUBLIC_BASE_URL || 'http://localhost:8081';
-  console.log('Using base URL:', baseUrl);
   const initialAuth = createOAuthClient(baseUrl, 'bsky.social');
 
   console.log('Auth client created!');

apps/amethyst/stores/preferenceSlice.tsx

···
   return {
     colorTheme: 'system',
     setColorTheme: (theme) => set({ colorTheme: theme }),
-    tealDid: 'did:web:rina.z.teal.fm',
+    tealDid: process.env.EXPO_PUBLIC_DID_WEB ?? 'did:web:rina.z.teal.fm',
     setTealDid: (url) => set({ tealDid: url }),
   };
 };

apps/aqua/Dockerfile

···
-# Use the official Bun image as base
-FROM oven/bun:1.0 AS builder
-
+FROM node:22-slim AS builder
+ENV PNPM_HOME="/pnpm"
+ENV PATH="$PNPM_HOME:$PATH"
+RUN corepack enable
 # Set working directory
 WORKDIR /app
 
 # Copy root workspace files
-COPY package.json bun.lockb ./
+COPY package.json pnpm-workspace.yaml pnpm-lock.yaml ./
 
 # Copy turbo.json
 COPY turbo.json ./
···
 # Copy the aqua app
 COPY apps/aqua/ ./apps/aqua/
 
-# Install dependencies
-RUN bun install
-
-# Build workspace packages (if needed)
-RUN bun run build --filter=@teal/db
-RUN bun run build --filter=@teal/lexicons
-
 # Build the aqua app
 WORKDIR /app/apps/aqua
-RUN bun run build
+RUN pnpm install
+RUN pnpm run build
 
 # Start production image (node lts ideally)
 FROM node:bookworm-slim
···
 COPY --from=builder /app/apps/aqua/node_modules ./node_modules
 COPY --from=builder /app/apps/aqua/package.json ./
 
+# install pino-pretty for logs
+RUN npm install -g pino-pretty@13.0.0
+
 # move public to cwd
 RUN mv ./dist/public ./public
 
···
 EXPOSE 3000
 
 # Start the application
-CMD ["npm", "run", "start"]
+CMD ["node", "dist/index.cjs", "|", "pino-pretty"]

apps/aqua/package.json

···
     "@atproto/syntax": "^0.3.0",
     "@atproto/xrpc-server": "^0.7.4",
     "@braintree/sanitize-url": "^7.1.0",
-    "drizzle-orm": "^0.38.3",
     "@hono/node-server": "^1.13.7",
     "@libsql/client": "^0.14.0",
+    "@teal/db": "workspace:*",
+    "@teal/lexicons": "workspace:*",
     "dotenv": "^16.4.5",
+    "dotenv-expand": "^12.0.2",
+    "drizzle-orm": "^0.38.3",
     "envalid": "^8.0.0",
     "hono": "^4.6.9",
     "jose": "^5.9.6",
     "pino": "^9.5.0",
     "turbo": "^2.2.3",
-    "uhtml": "^4.5.11",
-    "@teal/db": "workspace:*",
-    "@teal/lexicons": "workspace:*"
+    "uhtml": "^4.5.11"
   },
   "devDependencies": {
-    "@teal/tsconfig": "workspace:*",
     "@atproto/lex-cli": "^0.5.4",
+    "@teal/tsconfig": "workspace:*",
     "@types/node": "^20.17.6",
     "drizzle-kit": "^0.30.1",
     "pino-pretty": "^13.0.0",

apps/aqua/src/index.ts

···
         logger.info(
           `Listening on ${
             info.address == '::1'
-              ? 'http://0.0.0.0'
+              ? `http://${env.HOST}`
               : // TODO: below should probably be https://
                 // but i just want to ctrl click in the terminal
                 'http://' + info.address

apps/aqua/src/lib/env.ts

···
 import dotenv from 'dotenv';
+import dotenvExpand from "dotenv-expand";
 import { cleanEnv, host, port, str, testOnly } from 'envalid';
 import process from 'node:process';
 
-dotenv.config();
+dotenvExpand.expand(dotenv.config());
 // in case our .env file is in the root folder
-dotenv.config({ path: './../../.env' });
+dotenvExpand.expand(dotenv.config({ path: './../../.env' }));
 
 export const env = cleanEnv(process.env, {
   NODE_ENV: str({

compose.dev.yml

···
     container_name: aqua-app
     ports:
       - "3000:3000"
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
     networks:
       - app_network
     depends_on:
       - postgres
-      - redis
     env_file:
       - .env
-  # traefik:
-  #   image: traefik:v2.10
-  #   container_name: traefik
-  #   command:
-  #     - "--api.insecure=true"
-  #     - "--providers.file.directory=/etc/traefik/dynamic"
-  #     - "--providers.file.watch=true"
-  #     - "--entrypoints.web.address=:80"
-  #   ports:
-  #     - "80:80" # HTTP
-  #     - "8080:8080" # Dashboard
-  #   volumes:
-  #     - ./traefik/dynamic:/etc/traefik/dynamic:ro
-  #   networks:
-  #     - app_network
-  #   extra_hosts:
-  #     - "host.docker.internal:host-gateway" # This allows reaching host machine
-
-  # postgres:
-  #   image: postgres:latest
-  #   container_name: postgres_db
-  #   environment:
-  #     POSTGRES_USER: postgres
-  #     POSTGRES_PASSWORD: yourpassword
-  #     POSTGRES_DB: yourdatabase
-  #   ports:
-  #     - "5432:5432"
-  #   volumes:
-  #     - postgres_data:/var/lib/postgresql/data
-  #   networks:
-  #     - app_network
-
-  # redis:
-  #   image: redis:latest
-  #   container_name: redis_cache
-  #   ports:
-  #     - "6379:6379"
-  #   volumes:
-  #     - redis_data:/data
-  #   command: redis-server --appendonly yes
-  #   networks:
-  #     - app_network
-
+    environment:
+      DATABASE_URL: ${DOCKER_DB_URL}
+  amethyst:
+    build:
+      context: .
+      dockerfile: apps/amethyst/Dockerfile
+      args:
+        - CLIENT_ADDRESS=${CLIENT_ADDRESS}
+    ports:
+      - "80:80"
+      - "443:443"
+      - "443:443/udp"
+    volumes:
+      - caddy_data:/data
+      - caddy_config:/config
+    networks:
+      - app_network
+    environment:
+      CLIENT_ADDRESS: ${CLIENT_ADDRESS}
+  postgres:
+    image: postgres:latest
+    container_name: postgres_db
+    environment:
+      POSTGRES_USER: ${DB_USER}
+      POSTGRES_PASSWORD: ${DB_PASSWORD}
+      POSTGRES_DB: ${DB_NAME}
+    ports:
+      - "5432:5432"
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+    networks:
+      - app_network
+  cadet:
+    image: ghcr.io/espeon/cadet
+    ports:
+      - "9000:9000"
+    env_file:
+      - .env
+    environment:
+      DATABASE_URL: ${DOCKER_DB_URL}
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+    networks:
+      - app_network
+    depends_on:
+      - postgres
+  satellite:
+    image: ghcr.io/espeon/satellite
+    ports:
+      - "3132:3000"
+    env_file:
+      - .env
+    environment:
+      DATABASE_URL: ${DOCKER_DB_URL}
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+    networks:
+      - app_network
+    depends_on:
+      - postgres
+  piper:
+    image: ghcr.io/teal-fm/piper:main
+    # Depends on your .env.air
+    ports:
+      - "8080:8080"
+    env_file:
+      - .env.air
+    volumes:
+      - piper_data:/db
 networks:
   app_network:
     driver: bridge
-
 volumes:
   postgres_data:
-  redis_data:
+  caddy_data:
+  caddy_config:
+  piper_data:

package.json

···
     "typecheck": "pnpm -r exec tsc --noEmit",
     "fix": "biome lint --apply . && biome format --write . && biome check . --apply",
     "nuke": "rimraf node_modules */*/node_modules",
-    "lex:gen-server": "turbo lex:gen-server"
+    "lex:gen-server": "turbo lex:gen-server",
+    "db:migrate": "cd ./packages/db && drizzle-kit migrate"
   },
   "dependencies": {
     "@atproto/oauth-client": "^0.3.8"

packages/db/drizzle.config.ts

···
 import { defineConfig } from "drizzle-kit";
+import dotenv from "dotenv";
+import dotenvExpand from "dotenv-expand";
+
+//Loads from root .env
+dotenvExpand.expand(dotenv.config({ path: '../../.env' }));
+//Or can be overridden by .env in the current folder
+dotenvExpand.expand(dotenv.config());
+
+
 
 export default defineConfig({
   dialect: "postgresql",

packages/db/package.json

···
     "postgres": "^3.4.5"
   },
   "devDependencies": {
-    "@types/node": "^20.17.6"
+    "@types/node": "^20.17.6",
+    "dotenv-expand": "^12.0.2"
   }
 }

pnpm-lock.yaml

···
       dotenv:
         specifier: ^16.4.5
         version: 16.4.7
+      dotenv-expand:
+        specifier: ^12.0.2
+        version: 12.0.2
       drizzle-orm:
         specifier: ^0.38.3
         version: 0.38.4(@libsql/client@0.14.0)(@types/react@19.0.14)(expo-sqlite@15.2.9(expo@53.0.9(@babel/core@7.26.0)(@expo/metro-runtime@5.0.4(react-native@0.79.2(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0)))(react-native@0.79.2(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(react-native@0.79.2(@babel/core@7.26.0)(@types/react@19.0.14)(react@19.0.0))(react@19.0.0))(postgres@3.4.5)(react@19.0.0)
···
       '@types/node':
         specifier: ^20.17.6
         version: 20.17.14
+      dotenv-expand:
+        specifier: ^12.0.2
+        version: 12.0.2
 
   packages/lexicons:
     dependencies:
···
 
   dotenv-expand@11.0.7:
     resolution: {integrity: sha512-zIHwmZPRshsCdpMDyVsqGmgyP0yT8GAgXUnkdAoJisxvf33k7yO6OuoKmcTGuXPWSsm8Oh88nZicRLA9Y0rUeA==}
+    engines: {node: '>=12'}
+
+  dotenv-expand@12.0.2:
+    resolution: {integrity: sha512-lXpXz2ZE1cea1gL4sz2Ipj8y4PiVjytYr3Ij0SWoms1PGxIv7m2CRKuRuCRtHdVuvM/hNJPMxt5PbhboNC4dPQ==}
     engines: {node: '>=12'}
 
   dotenv@16.4.7:
···
       domhandler: 5.0.3
 
   dotenv-expand@11.0.7:
+    dependencies:
+      dotenv: 16.4.7
+
+  dotenv-expand@12.0.2:
     dependencies:
       dotenv: 16.4.7