update dependencies and build

Author: Xetera

.github/workflows/deploy.yaml

@@ -8,16 +8,32 @@ on:
 
 jobs:
   deploy:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04-arm
     steps:
       - name: Cloning repo
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
-      - name: Push to dokku
-        uses: dokku/github-action@master
+      - name: Store package.json version
+        run: |
+          echo "placewaifu_version=$(jq -r '.version' web/package.json)" >> $GITHUB_ENV
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: "${{ github.actor }}"
+          password: "${{ secrets.GITHUB_TOKEN }}"
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Build and push container
+        uses: docker/build-push-action@v6
         with:
-          git_push_flags: "--force"
-          git_remote_url: "ssh://dokku@${{ secrets.IP }}:22/placewaifu"
-          ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
+          context: .
+          file: Dockerfile
+          platforms: linux/arm64
+          push: true
+          tags: |
+            ghcr.io/xetera/placewaifu:${{ env.placewaifu_version }}
+            ghcr.io/xetera/placewaifu:latest

.gitignore

@@ -2,6 +2,6 @@
 dist-newstyle
 .vscode
 
-web/.cache
+web/.parcel-cache
 web/node_modules
 web/dist

Dockerfile

@@ -1,27 +1,43 @@
-FROM haskell:9.2.7 as build
+FROM node:22.14-slim AS web
+
+WORKDIR /app
+
+COPY ./assets ./assets
+COPY ./web ./web
+
+WORKDIR /app/web
+RUN apt-get clean && apt-get update && apt-get upgrade -y && apt-get install -y python3
+
+RUN --mount=type=cache,id=npm,target=/root/.npm npm ci
+
+RUN npm run build
+
+FROM haskell:9.10-slim-bullseye AS build
 
 WORKDIR /opt/server
-RUN apt-get clean && apt-get update
 
-RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - && apt-get install -y nodejs locales
+RUN cabal update
+RUN apt-get clean && apt-get update
+RUN apt-get install -y locales
 
 RUN locale-gen en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
+ENV LANG=en_US.UTF-8
+ENV LANGUAGE=en_US:en
+ENV LC_ALL=en_US.UTF-8
 
-COPY package.yaml stack.yaml* ./
-# COPY .stack-work ./stack-work
-RUN stack build --resolver lts-20.17 --only-dependencies
+COPY package.yaml placewaifu.cabal ./
+RUN --mount=type=cache,id=cabal-deps,target=/root/.cabal cabal build --only-dependencies -j4
 
 COPY ./ ./
-RUN stack install
-
-RUN cd web && npm i && npm run build
+RUN --mount=type=cache,id=cabal,target=/root/.cabal cabal install
 
 FROM ubuntu
 
+COPY --from=web /app/web/dist ./web/dist
 COPY --from=build /root/.local/bin/placewaifu .
-COPY --from=build /opt/server/web/dist ./web/dist
 COPY ./assets ./assets
-CMD ./placewaifu --assets=./assets
+
+USER nobody
+
+EXPOSE 3000
+CMD ["./placewaifu", "--assets=./assets"]

deploy/manifests/deployment.yaml

@@ -0,0 +1,39 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: placewaifu
+spec:
+  selector:
+    matchLabels:
+      app: placewaifu
+  template:
+    metadata:
+      labels:
+        app: placewaifu
+    spec:
+      containers:
+        - name: placewaifu
+          image: ghcr.io/xetera/placewaifu:latest
+          imagePullPolicy: Always
+          resources:
+            limits:
+              memory: "128Mi"
+              cpu: "100m"
+          ports:
+            - containerPort: 3000
+          env:
+            - name: OTEL_EXPORTER_OTLP_ENDPOINT
+              value: "http://alloy.monitoring.svc.cluster.local:4318"
+            - name: DATABASE_URL
+              valueFrom:
+                secretKeyRef:
+                  name: me-db-url
+                  key: DATABASE_URL
+          volumeMounts:
+            - name: me-config
+              mountPath: /app/config.toml
+              subPath: config.toml
+      volumes:
+        - name: me-config
+          secret:
+            secretName: me-config