Add dockerfiles / docker-compose file for all services

danyalprout · danyalprout · commit 02b06d120ff2 · 2025-09-23T14:02:30.000-05:00
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,9 @@
+/target/
+/ui/node_modules
+/ui/.next
+.git
+/data
+*.log
+.env
+.env.docker
+/ui/.env
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -0,0 +1,18 @@
+name: Docker Build
+permissions:
+  contents: read
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  docker-build:
+    name: Docker Build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - run: cp .env.example .env.docker
+      - run: docker compose -f docker-compose.tips.yml build
diff --git a/.gitignore b/.gitignore
@@ -18,6 +18,7 @@ Thumbs.db
 
 # Environment variables
 .env
+.env.docker
 /ui/.env
 
 # Claude
diff --git a/crates/audit/Dockerfile b/crates/audit/Dockerfile
@@ -0,0 +1,20 @@
+FROM rust:1-bookworm AS builder
+
+WORKDIR /app
+
+COPY Cargo.toml Cargo.lock ./
+COPY crates/ ./crates/
+
+RUN cargo build --release --bin tips-audit
+
+FROM debian:bookworm
+
+RUN apt-get update && apt-get install -y libssl3 && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /app
+
+COPY --from=builder /app/target/release/tips-audit /app/tips-audit
+
+EXPOSE 3001
+
+CMD ["/app/tips-audit"]
diff --git a/crates/ingress/Dockerfile b/crates/ingress/Dockerfile
@@ -0,0 +1,21 @@
+FROM rust:1-bookworm AS builder
+
+WORKDIR /app
+
+COPY Cargo.toml Cargo.lock ./
+COPY crates/ ./crates/
+COPY .sqlx/ ./.sqlx/
+
+RUN cargo build --release --bin tips-ingress
+
+FROM debian:bookworm
+
+RUN apt-get update && apt-get install -y libssl3 && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /app
+
+COPY --from=builder /app/target/release/tips-ingress /app/tips-ingress
+
+EXPOSE 3000
+
+CMD ["/app/tips-ingress"]
diff --git a/crates/ingress/src/main.rs b/crates/ingress/src/main.rs
@@ -18,7 +18,7 @@ use tips_datastore::PostgresDatastore;
 #[command(author, version, about, long_about = None)]
 struct Config {
     /// Address to bind the RPC server to
-    #[arg(long, env = "TIPS_INGRESS_ADDRESS", default_value = "127.0.0.1")]
+    #[arg(long, env = "TIPS_INGRESS_ADDRESS", default_value = "0.0.0.0")]
     address: IpAddr,
 
     /// Port to bind the RPC server to
diff --git a/crates/maintenance/Dockerfile b/crates/maintenance/Dockerfile
@@ -0,0 +1,19 @@
+FROM rust:1-bookworm AS builder
+
+WORKDIR /app
+
+COPY Cargo.toml Cargo.lock ./
+COPY crates/ ./crates/
+COPY .sqlx/ ./.sqlx/
+
+RUN cargo build --release --bin tips-maintenance
+
+FROM debian:bookworm
+
+RUN apt-get update && apt-get install -y libssl3 && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /app
+
+COPY --from=builder /app/target/release/tips-maintenance /app/tips-maintenance
+
+CMD ["/app/tips-maintenance"]
diff --git a/docker-compose.tips.yml b/docker-compose.tips.yml
@@ -0,0 +1,40 @@
+services:
+  tips-ingress:
+    build:
+      context: .
+      dockerfile: crates/ingress/Dockerfile
+    container_name: tips-ingress
+    ports:
+      - "8080:8080"
+    env_file:
+      - .env.docker
+    restart: unless-stopped
+
+  tips-audit:
+    build:
+      context: .
+      dockerfile: crates/audit/Dockerfile
+    container_name: tips-audit
+    env_file:
+      - .env.docker
+    restart: unless-stopped
+
+  tips-maintenance:
+    build:
+      context: .
+      dockerfile: crates/maintenance/Dockerfile
+    container_name: tips-maintenance
+    env_file:
+      - .env.docker
+    restart: unless-stopped
+
+  tips-ui:
+    build:
+      context: .
+      dockerfile: ui/Dockerfile
+    ports:
+      - "3000:3000"
+    container_name: tips-ui
+    env_file:
+      - .env.docker
+    restart: unless-stopped
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -22,11 +22,12 @@ services:
     container_name: tips-kafka
     ports:
       - "9092:9092"
+      - "9094:9094"
     environment:
       KAFKA_BROKER_ID: 1
-      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT,CONTROLLER:PLAINTEXT
-      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:29092,PLAINTEXT_HOST://localhost:9092
-      KAFKA_LISTENERS: PLAINTEXT://0.0.0.0:29092,CONTROLLER://0.0.0.0:9093,PLAINTEXT_HOST://0.0.0.0:9092
+      KAFKA_LISTENER_SECURITY_PROTOCOL_MAP: PLAINTEXT:PLAINTEXT,PLAINTEXT_HOST:PLAINTEXT,PLAINTEXT_DOCKER:PLAINTEXT,CONTROLLER:PLAINTEXT
+      KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://kafka:29092,PLAINTEXT_HOST://localhost:9092,PLAINTEXT_DOCKER://host.docker.internal:9094
+      KAFKA_LISTENERS: PLAINTEXT://0.0.0.0:29092,CONTROLLER://0.0.0.0:9093,PLAINTEXT_HOST://0.0.0.0:9092,PLAINTEXT_DOCKER://0.0.0.0:9094
       KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
       KAFKA_CONTROLLER_LISTENER_NAMES: CONTROLLER
       KAFKA_ZOOKEEPER_CONNECT: ' '
@@ -87,5 +88,4 @@ services:
       /usr/bin/mc mb minio/tips;
       /usr/bin/mc anonymous set public minio/tips;
       exit 0;
-      "
-
+      "
diff --git a/justfile b/justfile
@@ -27,8 +27,21 @@ sync: deps-reset
     cd ui && mv ./drizzle/schema.ts ./src/db/
     cd ui && rm -rf ./drizzle
     ###   ENV    ###
+    just sync-env
+    ###    REFORMAT   ###
+    just fix
+
+sync-env:
     cp .env.example .env
     cp .env.example ./ui/.env
+    cp .env.example .env.docker
+    # Change kafka ports
+    sed -i '' 's/localhost:9092/host.docker.internal:9094/g' ./.env.docker
+    # Change other dependencies
+    sed -i '' 's/localhost/host.docker.internal/g' ./.env.docker
+
+start-all:
+    export COMPOSE_FILE=docker-compose.yml:docker-compose.tips.yml && docker compose down && docker compose rm && docker compose build && rm -rf data/ && mkdir -p data/postgres data/kafka data/minio && docker compose up -d
 
 ### RUN SERVICES ###
 deps-reset:
diff --git a/ui/Dockerfile b/ui/Dockerfile
@@ -0,0 +1,39 @@
+FROM node:20-alpine AS deps
+WORKDIR /app
+COPY ui/package.json ui/yarn.lock ./
+RUN yarn install --frozen-lockfile
+
+FROM node:20-alpine AS builder
+WORKDIR /app
+COPY --from=deps /app/node_modules ./node_modules
+COPY ./ui .
+
+ENV NEXT_TELEMETRY_DISABLED=1
+
+RUN yarn build
+
+FROM node:20-alpine AS runner
+WORKDIR /app
+
+ENV NODE_ENV=production
+ENV NEXT_TELEMETRY_DISABLED=1
+
+RUN addgroup --system --gid 1001 nodejs
+RUN adduser --system --uid 1001 nextjs
+
+
+RUN mkdir .next
+RUN chown nextjs:nodejs .next
+
+COPY --from=builder /app/public ./public
+COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
+COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
+
+USER nextjs
+
+EXPOSE 3000
+
+ENV PORT=3000
+ENV HOSTNAME="0.0.0.0"
+
+CMD ["node", "server.js"]
diff --git a/ui/next.config.ts b/ui/next.config.ts
@@ -1,7 +1,7 @@
 import type { NextConfig } from "next";
 
 const nextConfig: NextConfig = {
-  /* config options here */
+  output: "standalone",
 };
 
 export default nextConfig;
diff --git a/ui/public/logo.svg b/ui/public/logo.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1280 323.84">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: blue;
+      }
+    </style>
+  </defs>
+  <path d="M447.23,323.58c-25.22,0-49.54-9.22-63.87-33.54h-8.32v26.62h-57.34V0h57.34v115.2h8.32c14.72-25.22,42.24-34.94,67.07-34.94,61.95,0,103.81,49.54,103.81,119.3s-45.95,123.9-107.01,123.9v.13ZM434.82,272.26c35.33,0,60.54-28.93,60.54-70.27s-25.73-70.27-60.54-70.27-59.65,27.52-59.65,70.27,25.22,70.27,59.65,70.27ZM660.22,323.58c-44.03,0-79.87-26.62-79.87-70.27s39.42-67.97,87.17-72.96l67.46-6.91v-12.8c0-19.71-16.13-33.54-44.54-33.54s-42.75,11.9-47.74,29.82h-55.04c5.5-43.65,41.73-76.67,102.78-76.67s97.79,28.42,97.79,83.97v112c0,14.21,1.41,33.92,2.3,39.42v.9h-55.04c-.51-7.81-.51-15.1-.51-22.91h-8.32c-14.21,22.91-39.04,29.82-66.56,29.82l.13.13ZM675.84,280.45c37.63,0,59.26-28.42,59.26-57.34v-11.52l-50.56,6.02c-31.23,3.71-46.34,12.8-46.34,33.02s15.62,29.82,37.63,29.82ZM926.08,323.58c-57.86,0-99.2-28.93-105.6-74.37h56.45c6.4,20.22,27.52,28.93,49.54,28.93s40.83-9.6,40.83-26.62-17.41-21.63-41.34-25.73l-24.32-4.1c-45.95-7.81-74.37-27.14-74.37-68.35s39.42-72.96,94.08-72.96,88.58,24.83,98.18,67.97h-55.04c-6.4-17.02-23.42-23.81-42.75-23.81s-38.53,10.11-38.53,24.32,11.9,19.33,36.74,23.42l24.32,4.1c44.54,7.3,78.46,25.73,78.46,70.27s-40.45,77.18-96.9,77.18l.26-.26ZM1166.59,323.58c-70.66,0-117.5-48.26-117.5-122.11s49.54-121.22,118.02-121.22,112.9,53.25,112.9,123.52v10.11h-174.85c2.82,38.14,29.44,60.54,61.57,60.54s42.75-9.22,50.56-25.22h58.75c-11.9,43.14-54.66,74.37-109.31,74.37h-.13ZM1223.94,175.87c-4.61-30.72-28.93-48.64-57.34-48.64s-55.04,17.41-60.54,48.64h118.02-.13Z"/>
+  <path class="cls-1" d="M13.82,316.8c-9.22,0-13.82-4.61-13.82-13.82V100.99c0-9.22,4.61-13.82,13.82-13.82h201.98c9.22,0,13.82,4.61,13.82,13.82v201.98c0,9.22-4.61,13.82-13.82,13.82H13.82Z"/>
+</svg>
diff --git a/ui/src/db/relations.ts b/ui/src/db/relations.ts
@@ -0,0 +1,2 @@
+import { relations } from "drizzle-orm/relations";
+import {} from "./schema";
diff --git a/ui/src/db/schema.ts b/ui/src/db/schema.ts
@@ -1,3 +1,4 @@
+import { sql } from "drizzle-orm";
 import {
   bigint,
   char,
diff --git a/ui/src/lib/s3.ts b/ui/src/lib/s3.ts
@@ -41,10 +41,7 @@ function createS3Client(): S3Client {
 
 const s3Client = createS3Client();
 
-const BUCKET_NAME = process.env.TIPS_UI_S3_BUCKET_NAME;
-if (process.env.TIPS_UI_S3_BUCKET_NAME === undefined) {
-  throw new Error("You must specify a valid bucket");
-}
+const BUCKET_NAME = process.env.TIPS_UI_S3_BUCKET_NAME || "tips";
 
 export interface TransactionMetadata {
   bundle_ids: string[];
