Merge pull request #1904 from scpwiki/WJ-994-single-dokku

[WJ-994] Set up single image for Dokku dev deploy

.github/workflows/docker-build-web.dev.yaml → .github/workflows/docker-build-dokku.dev.yaml

@@ -1,11 +1,12 @@
-name: '[backend] Docker build Framerail (dev)'
+name: '[backend] Docker build Dokku (dev)'
 
 on:
   pull_request:
     paths:
+      - 'deepwell/**'
       - 'framerail/**'
-      - 'install/aws/dev/docker/web/Dockerfile'
-      - '.github/workflows/docker-build-web.dev.yaml'
+      - 'install/dev/dokku/Dockerfile'
+      - '.github/workflows/docker-build-dokku.dev.yaml'
 
 jobs:
   build:
@@ -15,6 +16,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Build image
-        run: docker build -f install/aws/dev/docker/web/Dockerfile .
+        run: docker build -f install/dev/dokku/Dockerfile .
         env:
           DOCKER_BUILDKIT: 1
+

.github/workflows/docker-build-push-api.dev.yaml → .github/workflows/docker-build-push-dokku.dev.yaml

@@ -1,13 +1,14 @@
-name: '[deploy] Docker push Deepwell'
+name: '[deploy] Docker push Dokku'
 
 on:
   push:
     branches:
       - develop
     paths:
       - 'deepwell/**'
-      - 'install/aws/dev/docker/api/**'
-      - '.github/workflows/docker-build-push-api.dev.yaml'
+      - 'framerail/**'
+      - 'install/dev/dokku/Dockerfile'
+      - '.github/workflows/docker-build-push-dokku.dev.yaml'
 
 jobs:
   build:
@@ -22,5 +23,5 @@ jobs:
         uses: dokku/github-action@master
         with:
           ssh_private_key: ${{ secrets.DOKKU_DEPLOY_KEY }}
-          git_remote_url: 'ssh://[email protected]:22/deepwell'
+          git_remote_url: 'ssh://[email protected]:22/wikijump'
           git_push_flags: --force --verbose

Procfile

@@ -0,0 +1,2 @@
+web: /usr/bin/node /app/framerail/build
+api: /usr/local/bin/deepwell /etc/deepwell.toml

app.json

@@ -0,0 +1,36 @@
+{
+  "healthchecks": {
+    "web": [
+        {
+            "type":        "startup",
+            "name":        "framerail-init",
+            "description": "Checks if the web server has started",
+            "port":        3000,
+            "attempts":    3
+        },
+        {
+            "type":        "liveness",
+            "name":        "framerail-healthy",
+            "description": "Checks if the web server can start serving requests",
+            "command":     ["curl", "-If", "http://localhost:3000/"],
+            "attempts":    3
+        }
+    ],
+    "api": [
+        {
+            "type":        "startup",
+            "name":        "deepwell-init",
+            "description": "Checks if API server has started",
+            "port":        2747,
+            "attempts":    3
+        },
+        {
+            "type":        "liveness",
+            "name":        "deepwelly-healthy",
+            "description": "Checks if the API server can accept requests",
+            "command":     ["/bin/deepwell-health-check"],
+            "attempts":    3
+        }
+    ]
+  }
+}

install/aws/prod/docker/api/Dockerfile

@@ -23,7 +23,6 @@ RUN cargo build --release
 # Final image
 #
 
-# We want alpine, but need glibc
 FROM alpine:latest
 
 ENV LOCALIZATION_PATH="/opt/locales"

install/aws/prod/docker/postgres/Dockerfile

@@ -1,4 +1,4 @@
-FROM postgres:14-alpine
+FROM postgres:16-alpine
 
 EXPOSE 5432
 

install/aws/dev/docker/api/Dockerfile → install/dev/dokku/Dockerfile

@@ -19,23 +19,48 @@ RUN cargo vendor
 # Build deepwell server
 RUN cargo build --release
 
+#
+# Framerail build
+#
+
+FROM node:19-alpine AS node
+
+# Install pnpm
+RUN npm install -g pnpm
+
+# Copy sources
+RUN mkdir /app
+WORKDIR /app
+COPY framerail/ ./
+COPY assets ./src/assets
+
+# Install app
+RUN \
+    pnpm install && \
+    pnpm build && \
+    pnpm prune --prod && \
+    rm -rf src/ tests/
+
 #
 # Final image
 #
 
-# We want alpine, but need glibc
 FROM alpine:latest
 
 ENV LOCALIZATION_PATH="/opt/locales"
 
+RUN mkdir /app
+WORKDIR /app
+
 RUN apk update
-RUN apk add --no-cache curl
+RUN apk add --no-cache curl nodejs libmagic-static file
+
 COPY --from=rust /src/deepwell/target/release/deepwell /usr/local/bin/deepwell
-COPY ./install/files/api/health-check.sh /bin/wikijump-health-check
+COPY --from=node /app /app/framerail
+
+COPY ./install/files/api/health-check.sh /bin/deepwell-health-check
 COPY ./install/files/dev/deepwell.toml /etc/deepwell.toml
 COPY ./locales/fluent /opt/locales/fluent
 COPY ./deepwell/seeder /opt/seeder
 
 USER daemon
-EXPOSE 2747
-CMD ["/usr/local/bin/deepwell", "/etc/deepwell.toml"]

install/files/postgres/init/02-seed.sql

@@ -1,7 +1,13 @@
 SET default_transaction_read_only = off;
 
+CREATE ROLE wikijump
+    WITH INHERIT NOSUPERUSER NOCREATEDB LOGIN NOREPLICATION NOBYPASSRLS ENCRYPTED PASSWORD 'wikijump';
+
+CREATE DATABASE wikijump
+    WITH OWNER wikijump;
+
 CREATE ROLE wikijump_ro
-    WITH INHERIT NOSUPERUSER NOCREATEDB LOGIN NOREPLICATION NOBYPASSRLS PASSWORD 'wikijump_ro';
+    WITH INHERIT NOSUPERUSER NOCREATEDB LOGIN NOREPLICATION NOBYPASSRLS ENCRYPTED PASSWORD 'wikijump_ro';
 
 \connect wikijump
 

install/local/dev/docker-compose.yaml

@@ -69,7 +69,7 @@ services:
       - "S3_SECRET_ACCESS_KEY=defaultpassword"
     restart: always
     healthcheck:
-      test: ["CMD", "curl", "-f", "-X", "POST", "--json", '{"jsonrpc":"2.0","method":"ping","id":9000}', "http://localhost:2747/jsonrpc"]
+      test: ["CMD", "/bin/wikijump-health-check"]
       interval: 120s
       timeout: 2s
       retries: 3

install/local/dev/postgres/Dockerfile

@@ -1,4 +1,4 @@
-FROM postgres:14-alpine
+FROM postgres:16-alpine
 
 EXPOSE 5432