Merge pull request #53 from TBosak/main

Adding arm64 support

Author: TBosak

.github/workflows/docker-deploy.yml

@@ -3,6 +3,12 @@ name: Build and Push Docker Images
 on:
   push:
     branches: [deploy]
+  workflow_dispatch:
+    inputs:
+      version:
+        description: "Version tag (leave empty to use package.json version and tag as latest)"
+        required: false
+        type: string
 
 jobs:
   build-and-push:
@@ -13,40 +19,63 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+        with:
+          platforms: arm64
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
-      # Login to Docker Hub
       - name: Log in to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: docker.io
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      # Login to GitHub Container Registry
       - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GHCR_TOKEN }}
 
-      - name: Extract version from package.json
+      - name: Determine version and tags
         id: vars
         run: |
-          VERSION=$(node -p "require('./package.json').version")
+          if [ -n "${{ inputs.version }}" ]; then
+            VERSION="${{ inputs.version }}"
+            USE_LATEST="false"
+          else
+            VERSION=$(node -p "require('./package.json').version")
+            USE_LATEST="true"
+          fi
+
+          TAGS="docker.io/tbosk/mkfd:${VERSION}"$'\n'"ghcr.io/tbosak/mkfd:${VERSION}"
+          if [ "${USE_LATEST}" = "true" ]; then
+            TAGS="$TAGS"$'\n'"docker.io/tbosk/mkfd:latest"$'\n'"ghcr.io/tbosak/mkfd:latest"
+          fi
+
           echo "VERSION=$VERSION" >> $GITHUB_ENV
+          echo "USE_LATEST=$USE_LATEST" >> $GITHUB_ENV
+          echo "TAGS<<EOF" >> $GITHUB_ENV
+          echo "$TAGS" >> $GITHUB_ENV
+          echo "EOF" >> $GITHUB_ENV
+
+          echo "Building version: $VERSION (latest tag: $USE_LATEST)"
+          echo "Docker tags:"
+          echo "$TAGS"
 
-      - name: Build and push Docker images to Docker Hub and GHCR
-        uses: docker/build-push-action@v4
+      - name: Build and push multi-arch images to Docker Hub and GHCR
+        uses: docker/build-push-action@v6
         with:
           context: .
           push: true
-          tags: |
-            docker.io/tbosk/mkfd:latest
-            docker.io/tbosk/mkfd:${{ env.VERSION }}
-            ghcr.io/tbosak/mkfd:latest
-            ghcr.io/tbosak/mkfd:${{ env.VERSION }}
+          platforms: linux/amd64,linux/arm64
+          tags: ${{ env.TAGS }}
+          provenance: true
+          network: host
+          allow: network.host

dockerfile

@@ -1,25 +1,44 @@
 FROM oven/bun:1.2.2-debian
+ARG NODE_MAJOR=22
+ENV PLAYWRIGHT_BROWSERS_PATH=/ms-playwright
 
-RUN apt-get update && apt-get install -y \
-    curl \
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    ca-certificates curl gnupg \
  && rm -rf /var/lib/apt/lists/*
 
-RUN curl -fsSL https://deb.nodesource.com/setup_23.x | bash - \
- && apt-get install -y nodejs
+RUN printf 'Acquire::Retries "5";\nAcquire::http::Timeout "30";\nAcquire::https::Timeout "30";\n' \
+    > /etc/apt/apt.conf.d/80-retries
 
- ENV PLAYWRIGHT_BROWSERS_PATH=/ms-playwright
- RUN bunx patchright install --with-deps chromium
+RUN if [ -f /etc/apt/sources.list ]; then \
+      sed -i 's|http://deb.debian.org|https://deb.debian.org|g; s|http://security.debian.org|https://security.debian.org|g' /etc/apt/sources.list; \
+    fi && \
+    if [ -f /etc/apt/sources.list.d/debian.sources ]; then \
+      sed -i 's|http://deb.debian.org|https://deb.debian.org|g; s|http://security.debian.org|https://security.debian.org|g' /etc/apt/sources.list.d/debian.sources; \
+    fi
+
+RUN curl -fsSL https://deb.nodesource.com/setup_${NODE_MAJOR}.x | bash - \
+ && apt-get update \
+ && apt-get install -y --no-install-recommends nodejs \
+ && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /app
 
-COPY package.json bun.lock ./
+COPY package.json bun.lock* ./
 RUN bun install
 
+RUN set -eux; \
+  ok=0; \
+  for i in 1 2 3 4 5; do \
+    if bunx patchright install --with-deps chromium; then ok=1; break; fi; \
+    echo "patchright install failed (attempt $i), retrying..."; \
+    sleep $((i * 5)); \
+  done; \
+  [ "$ok" -eq 1 ]
+
 COPY . .
 
-# Create directories for volumes
-RUN mkdir -p /app/configs /app/extensions && \
-    chmod -R 755 /app/configs /app/extensions
+RUN mkdir -p /app/configs /app/extensions \
+ && chmod -R 755 /app/configs /app/extensions
 
 EXPOSE 5000
 
@@ -28,4 +47,4 @@ VOLUME ["/app/configs", "/app/extensions"]
 HEALTHCHECK --interval=5m --timeout=10s --start-period=1m --retries=3 \
   CMD curl -f http://localhost:5000/ || exit 1
 
-CMD ["bun", "run", "index.ts"]
+CMD ["bun", "run", "index.ts"]