Revert "build"

This reverts commit b6bc5391cf.

.github/workflows/docker-publish.yml

@@ -3,7 +3,8 @@ name: Build & Publish Images
 on:
   push:
     branches: [ main, dev ]
-    tags: [ '*' ]
+    tags:
+      - '*'
   workflow_dispatch:
 
 env:
@@ -12,93 +13,46 @@ env:
   IMAGE_FRONTEND: papercrate-dms/papercrate-frontend
 
 jobs:
-  publish:
+  build:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        component: [backend, frontend]
+        platform: [linux/amd64, linux/arm64]
+
     permissions:
       contents: read
       packages: write
+      id-token: write
 
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
 
-      - name: Cache Cargo
+      - name: Set component metadata
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            backend/target
-          key: ${{ runner.os }}-cargo-${{ hashFiles('backend/Cargo.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-cargo-
-
-      - name: Install system dependencies
         run: |
-          sudo apt-get update
+          if [ "${{ matrix.component }}" = "backend" ]; then
-          sudo apt-get install -y pkg-config libssl-dev libpq-dev zig
+            echo "COMPONENT_CONTEXT=./backend" >> "$GITHUB_ENV"
+            echo "COMPONENT_IMAGE=${{ env.IMAGE_BACKEND }}" >> "$GITHUB_ENV"
+          else
+            echo "COMPONENT_CONTEXT=./frontend" >> "$GITHUB_ENV"
+            echo "COMPONENT_IMAGE=${{ env.IMAGE_FRONTEND }}" >> "$GITHUB_ENV"
+          fi
+          echo "COMPONENT_NAME=${{ matrix.component }}" >> "$GITHUB_ENV"
 
-      - name: Install Rust targets and tools
+      - name: Compute tags
-        run: |
-          rustup target add aarch64-unknown-linux-gnu
-          cargo install cargo-zigbuild cross
-
-      - name: Build backend binaries (amd64)
-        working-directory: backend
-        run: |
-          cargo build --release --bin backend --bin worker --bin webdav --bin admin
-          cargo install diesel_cli --no-default-features --features postgres --root target/diesel-amd64
-
-      - name: Build backend binaries (arm64)
-        working-directory: backend
-        run: |
-          cargo zigbuild --target aarch64-unknown-linux-gnu --release --bin backend --bin worker --bin webdav --bin admin
-          cross install diesel_cli --no-default-features --features postgres --target aarch64-unknown-linux-gnu --root target/diesel-arm64
-
-      - name: Prepare backend artifacts
-        run: |
-          set -eux
-          mkdir -p build-artifacts/backend/amd64 build-artifacts/backend/arm64
-          cp backend/target/release/backend build-artifacts/backend/amd64/papercrate-backend
-          cp backend/target/release/worker build-artifacts/backend/amd64/papercrate-worker
-          cp backend/target/release/webdav build-artifacts/backend/amd64/papercrate-webdav
-          cp backend/target/release/admin build-artifacts/backend/amd64/papercrate-admin
-          cp backend/target/diesel-amd64/bin/diesel build-artifacts/backend/amd64/diesel
-          cp backend/target/aarch64-unknown-linux-gnu/release/backend build-artifacts/backend/arm64/papercrate-backend
-          cp backend/target/aarch64-unknown-linux-gnu/release/worker build-artifacts/backend/arm64/papercrate-worker
-          cp backend/target/aarch64-unknown-linux-gnu/release/webdav build-artifacts/backend/arm64/papercrate-webdav
-          cp backend/target/aarch64-unknown-linux-gnu/release/admin build-artifacts/backend/arm64/papercrate-admin
-          cp backend/target/diesel-arm64/bin/diesel build-artifacts/backend/arm64/diesel
-          chmod +x build-artifacts/backend/*/*
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          cache: 'npm'
-          cache-dependency-path: frontend/package-lock.json
-
-      - name: Install frontend dependencies
-        working-directory: frontend
-        run: npm ci --no-audit --no-fund
-
-      - name: Build frontend
-        working-directory: frontend
-        run: npm run build
-
-      - name: Compute image tags
-        id: tags
         env:
           GITHUB_SHA: ${{ github.sha }}
           GITHUB_REF: ${{ github.ref }}
           REGISTRY: ${{ env.REGISTRY }}
+          PLATFORM: ${{ matrix.platform }}
         run: |
-          SHORT_SHA=${GITHUB_SHA::7}
+          ARCH=${PLATFORM#*/}
-          TAGS=("$SHORT_SHA")
+          TAGS=("${GITHUB_SHA::7}")
 
           BRANCH=${GITHUB_REF##*/}
           if [ "$BRANCH" = "dev" ]; then
-            TAGS+=("${SHORT_SHA}-dev")
+            TAGS+=("${GITHUB_SHA::7}-dev")
           fi
 
           if [[ "$GITHUB_REF" == refs/tags/* ]]; then
@@ -126,16 +80,12 @@ jobs:
               printf '%s\n' "$tag"
             done
             echo "EOF"
-            echo "BACKEND_TAGS<<EOF"
+            echo "IMAGE_TAGS<<EOF"
             for tag in "${UNIQUE[@]}"; do
-              printf '%s\n' "$REGISTRY/$IMAGE_BACKEND:$tag"
+              printf '%s\n' "$REGISTRY/$COMPONENT_IMAGE:${tag}-${ARCH}"
-            done
-            echo "EOF"
-            echo "FRONTEND_TAGS<<EOF"
-            for tag in "${UNIQUE[@]}"; do
-              printf '%s\n' "$REGISTRY/$IMAGE_FRONTEND:$tag"
             done
             echo "EOF"
+            echo "ARCH=$ARCH"
           } >> "$GITHUB_ENV"
 
       - name: Set up QEMU
@@ -148,27 +98,100 @@ jobs:
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
-          username: papercrate-dms
+          username: ${{ github.actor }}
-          password: ${{ secrets.GHCR_PAT }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build & push backend image
+      - name: Build & push ${{ env.COMPONENT_NAME }} (${{ matrix.platform }})
         uses: docker/build-push-action@v5
         with:
-          context: .
+          context: ${{ env.COMPONENT_CONTEXT }}
-          file: backend/Dockerfile
           push: true
-          platforms: linux/amd64,linux/arm64
+          platforms: ${{ matrix.platform }}
-          tags: ${{ env.BACKEND_TAGS }}
+          tags: ${{ env.IMAGE_TAGS }}
-          cache-from: type=gha,scope=backend
-          cache-to: type=gha,scope=backend,mode=max
 
-      - name: Build & push frontend image
+  manifest:
-        uses: docker/build-push-action@v5
+    runs-on: ubuntu-latest
+    needs: build
+    strategy:
+      matrix:
+        component: [backend, frontend]
+
+    permissions:
+      contents: read
+      packages: write
+
+    env:
+      REGISTRY: ghcr.io
+      ARCHES: amd64 arm64
+
+    steps:
+      - name: Set component metadata
+        run: |
+          if [ "${{ matrix.component }}" = "backend" ]; then
+            echo "COMPONENT_IMAGE=${{ env.IMAGE_BACKEND }}" >> "$GITHUB_ENV"
+          else
+            echo "COMPONENT_IMAGE=${{ env.IMAGE_FRONTEND }}" >> "$GITHUB_ENV"
+          fi
+          echo "COMPONENT_NAME=${{ matrix.component }}" >> "$GITHUB_ENV"
+
+      - name: Compute base tags
+        env:
+          GITHUB_SHA: ${{ github.sha }}
+          GITHUB_REF: ${{ github.ref }}
+        run: |
+          TAGS=("${GITHUB_SHA::7}")
+
+          BRANCH=${GITHUB_REF##*/}
+          if [ "$BRANCH" = "dev" ]; then
+            TAGS+=("${GITHUB_SHA::7}-dev")
+          fi
+
+          if [[ "$GITHUB_REF" == refs/tags/* ]]; then
+            TAGS+=("${GITHUB_REF#refs/tags/}")
+          fi
+
+          UNIQUE=()
+          for tag in "${TAGS[@]}"; do
+            [[ -z "$tag" ]] && continue
+            skip=false
+            for seen in "${UNIQUE[@]}"; do
+              if [ "$tag" = "$seen" ]; then
+                skip=true
+                break
+              fi
+            done
+            if [ "$skip" = false ]; then
+              UNIQUE+=("$tag")
+            fi
+          done
+
+          {
+            echo "BASE_TAGS<<EOF"
+            for tag in "${UNIQUE[@]}"; do
+              printf '%s\n' "$tag"
+            done
+            echo "EOF"
+          } >> "$GITHUB_ENV"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to GHCR
+        uses: docker/login-action@v3
         with:
-          context: .
+          registry: ${{ env.REGISTRY }}
-          file: frontend/Dockerfile
+          username: ${{ github.actor }}
-          push: true
+          password: ${{ secrets.GITHUB_TOKEN }}
-          platforms: linux/amd64,linux/arm64
+
-          tags: ${{ env.FRONTEND_TAGS }}
+      - name: Create manifests for ${{ env.COMPONENT_NAME }}
-          cache-from: type=gha,scope=frontend
+        run: |
-          cache-to: type=gha,scope=frontend,mode=max
+          while IFS= read -r tag; do
+            [ -n "$tag" ] || continue
+            args=()
+            for arch in $ARCHES; do
+              args+=("$REGISTRY/$COMPONENT_IMAGE:${tag}-${arch}")
+            done
+            docker buildx imagetools create \
+              --tag "$REGISTRY/$COMPONENT_IMAGE:$tag" \
+              "${args[@]}"
+          done <<< "$BASE_TAGS"

backend/Dockerfile

@@ -1,13 +1,33 @@
 # syntax=docker/dockerfile:1
 
-ARG TARGETARCH
+FROM rust:1-slim AS builder
-FROM debian:trixie-slim AS runtime
-ARG TARGETARCH
 WORKDIR /app
 
-RUN set -eux; \
+RUN apt-get update \
-    apt-get update; \
+    && apt-get install -y --no-install-recommends \
-    apt-get install -y --no-install-recommends \
+        build-essential \
+        pkg-config \
+        libssl-dev \
+        libpq-dev \
+        libjpeg-dev \
+        libpng-dev \
+        curl \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY Cargo.toml Cargo.lock ./
+COPY src ./src
+COPY migrations ./migrations
+COPY tests ./tests
+COPY diesel.toml ./
+
+RUN cargo build --release --bin backend --bin worker --bin webdav --bin admin
+RUN cargo install diesel_cli --no-default-features --features postgres
+
+FROM debian:trixie-slim AS runtime
+WORKDIR /app
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
         ca-certificates \
         curl \
         libssl3 \
@@ -17,33 +37,29 @@ RUN set -eux; \
         ocrmypdf \
         tesseract-ocr \
         ghostscript \
-        qpdf; \
+        qpdf \
-    rm -rf /var/lib/apt/lists/*; \
+    && rm -rf /var/lib/apt/lists/* \
-    case "$TARGETARCH" in \
+    && mkdir -p /usr/local/lib \
-        amd64) pdf_pkg=pdfium-linux-x64.tgz ;; \
+    && curl -fsSL https://github.com/bblanchon/pdfium-binaries/releases/latest/download/pdfium-linux-arm64.tgz -o /tmp/pdfium.tgz \
-        arm64) pdf_pkg=pdfium-linux-arm64.tgz ;; \
+    && mkdir -p /tmp/pdfium \
-        *) echo "Unsupported architecture: $TARGETARCH" >&2; exit 1 ;; \
+    && tar -xzf /tmp/pdfium.tgz -C /tmp/pdfium --strip-components=1 \
-    esac; \
+    && pdfium_so="$(find /tmp/pdfium -name libpdfium.so -type f | head -n1)" \
-    curl -fsSL "https://github.com/bblanchon/pdfium-binaries/releases/latest/download/${pdf_pkg}" -o /tmp/pdfium.tgz; \
+    && [ -n "${pdfium_so}" ] \
-    mkdir -p /tmp/pdfium; \
+    && mv "${pdfium_so}" /usr/local/lib/libpdfium.so \
-    tar -xzf /tmp/pdfium.tgz -C /tmp/pdfium --strip-components=1; \
+    && ldconfig \
-    pdfium_so="$(find /tmp/pdfium -name libpdfium.so -type f | head -n1)"; \
+    && rm -rf /tmp/pdfium.tgz /tmp/pdfium \
-    [ -n "$pdfium_so" ]; \
+    && useradd --system --create-home --uid 10001 appuser
-    mv "$pdfium_so" /usr/local/lib/libpdfium.so; \
-    ldconfig; \
-    rm -rf /tmp/pdfium /tmp/pdfium.tgz; \
-    useradd --system --create-home --uid 10001 appuser
-
-COPY build-artifacts/backend/${TARGETARCH}/papercrate-backend /usr/local/bin/papercrate-backend
-COPY build-artifacts/backend/${TARGETARCH}/papercrate-worker /usr/local/bin/papercrate-worker
-COPY build-artifacts/backend/${TARGETARCH}/papercrate-webdav /usr/local/bin/papercrate-webdav
-COPY build-artifacts/backend/${TARGETARCH}/papercrate-admin /usr/local/bin/papercrate-admin
-COPY build-artifacts/backend/${TARGETARCH}/diesel /usr/local/bin/diesel
 
+COPY --from=builder /app/target/release/backend /usr/local/bin/papercrate-backend
+COPY --from=builder /app/target/release/worker /usr/local/bin/papercrate-worker
+COPY --from=builder /app/target/release/webdav /usr/local/bin/papercrate-webdav
+COPY --from=builder /app/target/release/admin /usr/local/bin/papercrate-admin
+COPY --from=builder /usr/local/cargo/bin/diesel /usr/local/bin/diesel
 COPY migrations ./migrations
 COPY diesel.toml ./
 
 ENV RUST_LOG=info
 USER appuser
 EXPOSE 3000
+
 ENTRYPOINT ["/usr/local/bin/papercrate-backend"]

frontend/Dockerfile

@@ -1,9 +1,18 @@
 # syntax=docker/dockerfile:1
 
+FROM node:20-alpine AS build
+WORKDIR /app
+
+COPY package.json package-lock.json ./
+RUN npm ci --no-audit --no-fund
+
+COPY . .
+RUN npm run build
+
 FROM nginx:alpine
 WORKDIR /usr/share/nginx/html
 
-COPY dist ./
+COPY --from=build /app/dist ./
 
 ENV API_PROXY_PASS=""