feat: seeder works with compose up

Author: Plebbaroni

.github/workflows/build-chaos-nextjs.yml

@@ -0,0 +1,125 @@
+# I'm gonna make modifications to docker.yml here. I don't really understand all of it so this is [retty experimental]
+
+name: Build chaos next.js version
+
+on:
+  pull_request:
+    branches: [main, "renovate/*"]
+  push:
+    branches: ["*"]
+
+jobs:
+  build-backend:
+    name: Build (Backend)
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: true
+          token: ${{ secrets.GH_TOKEN }}
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@master
+        with:
+          install: true
+      - name: Cache Docker layers
+        uses: actions/cache@v3
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-multi-buildx-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-multi-buildx
+      - name: Docker Login
+        uses: docker/login-action@v2.2.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GH_TOKEN }}
+      - name: Build production image
+        uses: docker/build-push-action@v4
+        with:
+          context: backend
+          builder: ${{ steps.buildx.outputs.name }}
+          file: backend/Dockerfile
+          push: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/main' }}
+          tags: |
+            ghcr.io/devsoc-unsw/chaos-backend:${{ github.sha }}
+            ghcr.io/devsoc-unsw/chaos-backend:latest
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=local,src=/tmp/.buildx-cache
+          # Note the mode=max here
+          # More: https://github.com/moby/buildkit#--export-cache-options
+          # And: https://github.com/docker/buildx#--cache-tonametypetypekeyvalue
+          cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-new
+      - name: Move cache
+        run: |
+          rm -rf /tmp/.buildx-cache
+          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
+  build-client:
+    name: Build (Client)
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+        with:
+          platforms: arm64
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Log into registry ${{ env.REGISTRY }}
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GH_TOKEN }}
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v4
+        with:
+          context: frontend
+          push: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/main' }}
+          platforms: linux/amd64
+          file: frontend/Dockerfile
+          build-args: |
+            VITE_API_BASE_URL=${{ secrets.API_BASE_URL }}
+            VITE_OAUTH_CALLBACK_URL=${{ secrets.OAUTH_CALLBACK_URL }}
+          tags: |
+            ghcr.io/devsoc-unsw/chaos-frontend:${{ github.sha }}
+            ghcr.io/devsoc-unsw/chaos-frontend:latest
+          labels: ${{ steps.meta.outputs.labels }}
+  deploy:
+    name: Deploy (CD)
+    runs-on: ubuntu-latest
+    needs: [build-client, build-backend]
+    if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/main' }}
+    concurrency: staging
+    environment:
+      name: staging
+      url: https://chaos.staging.csesoc.unsw.edu.au
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          repository: devsoc-unsw/deployment
+          token: ${{ secrets.GH_TOKEN }}
+          ref: dev
+      - name: Install yq - portable yaml processor
+        uses: mikefarah/yq@v4.35.2
+      - name: Update deployment
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+        run: |
+          git config user.name "CSESoc CD"
+          git config user.email "technical@csesoc.org.au"
+          git checkout -b update/chaos/staging/${{ github.sha }}
+          yq -i '.items[0].spec.template.spec.containers[0].image = "ghcr.io/devsoc-unsw/chaos-frontend:${{ github.sha }}"' projects/chaos/staging/deploy-frontend.yml
+          yq -i '.items[0].spec.template.spec.containers[0].image = "ghcr.io/devsoc-unsw/chaos-backend:${{ github.sha }}"' projects/chaos/staging/deploy-backend.yml
+          git add .
+          git commit -m "feat(chaos/staging): update images"
+          git push -u origin update/chaos/staging/${{ github.sha }}
+          gh pr create --title "feat(chaos/staging): update images" --body "Updates the images for the chaos staging deployment to commit devsoc-unsw/chaos@${{ github.sha }}." > URL
+          gh pr merge $(cat URL) --squash -d

.github/workflows/deploy.yml

@@ -19,13 +19,30 @@ WORKDIR /backend/server
 COPY --from=planner /backend/server/recipe.json ./recipe.json
 
 RUN cargo chef cook --release --recipe-path recipe.json
-COPY migrations/ ./migrations/
+
+COPY migrations/ ../migrations/
 COPY server/ ./
 
-# build the application
+# Use sqlx folders for compile time checking, need to generate these in the workflow
+ENV SQLX_OFFLINE=true
+
+# Build the application
 WORKDIR /backend/server
 RUN cargo build --release
 
+# Build deploy-seeder
+FROM chef AS seeder-builder
+WORKDIR /backend
+
+
+COPY server/ ./server/
+COPY backend-deploy-utils/deploy-seeder/ ./backend-deploy-utils/deploy-seeder/
+
+ENV SQLX_OFFLINE=true
+
+WORKDIR /backend/backend-deploy-utils/deploy-seeder
+RUN cargo build --release
+
 FROM debian:trixie-slim
 
 RUN apt-get update && apt-get install -y \
@@ -35,14 +52,15 @@ RUN apt-get update && apt-get install -y \
     netcat-openbsd \
     && rm -rf /var/lib/apt/lists/*
 
-# copy sqlx-cli and migrations for running migrations on startup
+# Copy sqlx-cli and migrations for running migrations on startup
 COPY --from=chef /usr/local/bin/sqlx /usr/local/bin/sqlx
-COPY --from=builder /backend/server/migrations /backend/migrations
+COPY --from=builder /backend/migrations /backend/migrations
 COPY --from=builder /backend/server/target/release/server /backend/server
+COPY --from=seeder-builder /backend/backend-deploy-utils/deploy-seeder/target/release/deploy-seeder /backend/deploy-seeder
 
-# setup backend start script
+# Setup backend start script
 COPY backend-deploy-utils/startup-script/start-backend.sh /backend/start-backend.sh
 RUN chmod +x /backend/start-backend.sh
 
 ENTRYPOINT ["/backend/start-backend.sh"]
-EXPOSE 8080
+EXPOSE 8080

backend/Dockerfile

@@ -3,7 +3,7 @@ pub mod seeder;
 
 #[tokio::main]
 async fn main() {
-    dotenvy::dotenv().expect("Failed to load .env");
+    dotenvy::dotenv().ok();
 
     let seeder = init().await;
 

backend/backend-deploy-utils/deploy-seeder/.sqlx/query-163970f6f447b4341920dca8a27a55b880c5715fe271b308cb8f5ac21b9c3bae.json

@@ -10,6 +10,17 @@ if ! sqlx migrate run; then
   exit 1
 fi
 
-echo "Migrations run successfully! Starting server..."
-echo "Running server..."
+echo "Migrations run successfully!"
+
+# Run database seeding (this'll be idempotent so we're chill)
+echo "Running database seeding..."
+cd /backend
+if /backend/deploy-seeder; then
+  echo "Seeding completed successfully!"
+else
+  echo "Seeding failed! Aborting startup..."
+  exit 1
+fi
+
+echo "Starting server..."
 exec /backend/server

backend/backend-deploy-utils/deploy-seeder/.sqlx/query-7ab3b7179c666056d23829278c1927adf526fb1c4e36ced9994f265791e1ae93.json

@@ -14,8 +14,4 @@ CREATE TABLE users (
     updated_at TIMESTAMPTZ NOT NULL DEFAULT CURRENT_TIMESTAMP
 );
 
--- -- Seed initial superuser COMMENTING THIS OUT SO THAT WE USE .env INSTEAD
--- INSERT INTO users (id, email, name, role)
--- VALUES (10000, 'chaosdirectors@devsoc.app', 'Super Admin', 'SuperUser');
-
 CREATE UNIQUE INDEX IDX_users_email_lower on users((lower(email)));

backend/backend-deploy-utils/deploy-seeder/src/main.rs

@@ -1,7 +1,7 @@
 version: '3.8'
 
 services:
-  # PostgreSQL Database
+  # db
   db:
     image: postgres:17
     restart: unless-stopped
@@ -19,7 +19,7 @@ services:
       timeout: 5s
       retries: 5
 
-  # Rust Backend API
+  # server
   backend:
     build:
       context: ./backend
@@ -28,7 +28,6 @@ services:
     depends_on:
       db:
         condition: service_healthy
-    # Load env vars from backend/.env file
     env_file:
       - ./backend/.env
     environment:
@@ -42,7 +41,7 @@ services:
       retries: 3
       start_period: 40s
 
-  # Next.js Frontend
+  # next.js-frontend
   frontend:
     build:
       context: ./frontend-nextjs
@@ -51,11 +50,9 @@ services:
     depends_on:
       backend:
         condition: service_healthy
-    # Load env vars from frontend-nextjs/.env file
     env_file:
       - ./frontend-nextjs/.env
     environment:
-      # Override API URL to use Docker service name (container-to-container communication)
       NEXT_API_BASE_URL: ${NEXT_API_BASE_URL:-http://backend:8080}
       NODE_ENV: production
     ports: