Update CI workflows for unified deploy

Author: bglw

.github/workflows/outpost.yml

@@ -1,4 +1,4 @@
-name: Deploy to outpost/coup
+name: Deploy to staging
 
 on:
   push:
@@ -24,24 +24,11 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 1
-      - uses: actions/checkout@v3
       - uses: superfly/flyctl-actions/setup-flyctl@master
-      - name: Deploy Backend to Coup
+      - name: Deploy to staging
         run: |
           flyctl deploy \
-          -c fly.citadel.toml \
-          -a truncate-coup \
-          --build-arg TR_COMMIT="$(git rev-parse HEAD)" \
-          --build-arg TR_MSG="$(git log -1 --pretty=%B | head -n 1 | sed "s/\"/'/g")" \
-          --build-arg TR_ENV="outpost" \
-          --remote-only
-        env:
-          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
-      - name: Deploy Frontend to Outpost
-        run: |
-          flyctl deploy \
-          -c fly.client.toml \
-          -a truncate-outpost \
+          -a truncate-exclave \
           --build-arg TR_COMMIT="$(git rev-parse HEAD)" \
           --build-arg TR_MSG="$(git log -1 --pretty=%B | head -n 1 | sed "s/\"/'/g")" \
           --build-arg TR_ENV="outpost" \

.github/workflows/release.yml

@@ -24,24 +24,11 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 1
-      - uses: actions/checkout@v3
       - uses: superfly/flyctl-actions/setup-flyctl@master
-      - name: Deploy Backend to Citadel
+      - name: Deploy to production
         run: |
           flyctl deploy \
-          -c fly.citadel.toml \
-          -a truncate-citadel \
-          --build-arg TR_COMMIT="$(git rev-parse HEAD)" \
-          --build-arg TR_MSG="$(git log -1 --pretty=%B | head -n 1 | sed "s/\"/'/g")" \
-          --build-arg TR_ENV="production" \
-          --remote-only
-        env:
-          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}
-      - name: Deploy Frontend to production
-        run: |
-          flyctl deploy \
-          -c fly.client.toml \
-          -a truncate-client \
+          -a truncate \
           --build-arg TR_COMMIT="$(git rev-parse HEAD)" \
           --build-arg TR_MSG="$(git log -1 --pretty=%B | head -n 1 | sed "s/\"/'/g")" \
           --build-arg TR_ENV="production" \

Dockerfile.client DockerfileDockerfile.client renamed to Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:latest as build
+FROM rust:latest AS build
 
 RUN apt-get update && apt-get install -y \
     libssl-dev \
@@ -9,7 +9,6 @@ RUN apt-get update && apt-get install -y \
     git \
     jq
 
-# Install latest binaryen release
 RUN mkdir -p /tmp/binaryen \
     && curl -L https://github.com/WebAssembly/binaryen/releases/download/version_123/binaryen-version_123-x86_64-linux.tar.gz -o /tmp/binaryen.tar.gz \
     && tar -xzf /tmp/binaryen.tar.gz -C /tmp/binaryen --strip-components=1 \
@@ -21,9 +20,8 @@ RUN mkdir -p /tmp/binaryen \
 RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash -
 RUN apt-get install -y nodejs
 
-RUN curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
-# Keep this wasm-bindgen-cli version aligned with the latest egui release's dependency
-RUN cargo install -f wasm-bindgen-cli  --version 0.2.100
+# Keep this wasm-bindgen-cli version aligned with the version in Cargo.lock
+RUN cargo install -f wasm-bindgen-cli --version 0.2.100
 RUN rustup target add wasm32-unknown-unknown
 
 RUN mkdir /app
@@ -35,6 +33,7 @@ ARG TR_MSG
 ENV TR_MSG=$TR_MSG
 ARG TR_ENV
 ENV TR_ENV=$TR_ENV
+ENV SQLX_OFFLINE="true"
 
 ADD truncate_server /app/truncate_server
 ADD truncate_client /app/truncate_client
@@ -43,26 +42,28 @@ ADD truncate_core /app/truncate_core
 ADD dict_builder /app/dict_builder
 ADD Cargo.* /app
 
+RUN cargo build --release -p truncate_server
+
 ADD web_client /app/web_client
 ADD .backstage /app/.backstage
 RUN chmod +x .backstage/build-web-client.sh
 ENV TRUNC_OPT=true
 RUN .backstage/build-web-client.sh
 
-# Thin Docker image for runtime
-
-FROM debian:bullseye-slim
+# runtime image
 
-RUN apt-get update && apt-get install -y curl debian-keyring debian-archive-keyring apt-transport-https \
-    && curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/gpg.key' | gpg --dearmor -o /usr/share/keyrings/caddy-stable-archive-keyring.gpg \
-    && curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/debian.deb.txt' | tee /etc/apt/sources.list.d/caddy-stable.list \
-    && apt update \
-    && apt install caddy
+FROM debian:bookworm-slim
 
-RUN mkdir /app
-WORKDIR /app
+RUN apt-get update && apt-get install -y sqlite3 && rm -rf /var/lib/apt/lists/*
 
-ADD Caddyfile /app
+COPY --from=build /app/target/release/truncate_server /usr/local/bin/
 COPY --from=build /app/web_client/src/_site /app/web_client
 
-CMD caddy run
+RUN mkdir /truncate
+ADD word_definitions/defs.db.gz /truncate/defs.db.gz
+RUN gunzip /truncate/defs.db.gz
+
+ENV STATIC_DIR=/app/web_client
+ENV TR_DEFS_FILE=/truncate/defs.db
+
+CMD truncate_server

Dockerfile.citadel

@@ -1,24 +1,27 @@
-# fly.toml file generated for truncate-citadel on 2023-04-10T21:00:49+12:00
-
-# prod:     -a truncate-citadel
-# staging:  -a truncate-coup
+# Unified Truncate deployment
+# prod:    fly deploy -a truncate
+# staging: fly deploy -a truncate-exclave
 
 kill_signal = "SIGINT"
 kill_timeout = 5
 primary_region = "syd"
-processes = []
 
 [build]
-dockerfile = "Dockerfile.citadel"
+dockerfile = "Dockerfile"
+
+[env]
+STATIC_DIR = "/app/web_client"
+TR_DEFS_FILE = "/truncate/defs.db"
 
 [[services]]
 internal_port = 8080
 processes = ["app"]
 protocol = "tcp"
+
 [services.concurrency]
+type = "connections"
 hard_limit = 1000
 soft_limit = 800
-type = "connections"
 
 [[services.ports]]
 force_https = true