Merge 752ed7dd3c into 45df9dc5bf

ocurred -> occurred

.github/workflows/docker-build.yaml

@@ -8,15 +8,12 @@ on:
     types: [published]
 
 jobs:
-  build-and-push:
+  build-amd64:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
         with:
@@ -33,28 +30,104 @@ jobs:
         id: version
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
 
-      - name: Build and push Docker image
+      - name: Build and push AMD64 Docker image
         if: github.ref == 'refs/heads/master' && github.event_name == 'push'
         run: |
-          docker buildx create --use
+          DOCKERFILE=app.dockerfile
-          DOCKERFILE=app.dockerfile; \
+          IMAGE_NAME=perplexica
-          IMAGE_NAME=perplexica; \
+          docker buildx build --platform linux/amd64 \
-          docker buildx build --platform linux/amd64,linux/arm64 \
+            --cache-from=type=registry,ref=itzcrazykns1337/${IMAGE_NAME}:amd64 \
-            --cache-from=type=registry,ref=itzcrazykns1337/${IMAGE_NAME}:main \
             --cache-to=type=inline \
+            --provenance false \
             -f $DOCKERFILE \
-            -t itzcrazykns1337/${IMAGE_NAME}:main \
+            -t itzcrazykns1337/${IMAGE_NAME}:amd64 \
             --push .
 
-      - name: Build and push release Docker image
+      - name: Build and push AMD64 release Docker image
         if: github.event_name == 'release'
         run: |
-          docker buildx create --use
+          DOCKERFILE=app.dockerfile
-          DOCKERFILE=app.dockerfile; \
+          IMAGE_NAME=perplexica
-          IMAGE_NAME=perplexica; \
+          docker buildx build --platform linux/amd64 \
-          docker buildx build --platform linux/amd64,linux/arm64 \
+            --cache-from=type=registry,ref=itzcrazykns1337/${IMAGE_NAME}:${{ env.RELEASE_VERSION }}-amd64 \
-            --cache-from=type=registry,ref=itzcrazykns1337/${IMAGE_NAME}:${{ env.RELEASE_VERSION }} \
             --cache-to=type=inline \
+            --provenance false \
             -f $DOCKERFILE \
-            -t itzcrazykns1337/${IMAGE_NAME}:${{ env.RELEASE_VERSION }} \
+            -t itzcrazykns1337/${IMAGE_NAME}:${{ env.RELEASE_VERSION }}-amd64 \
             --push .
+
+  build-arm64:
+    runs-on: ubuntu-24.04-arm
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+        with:
+          install: true
+
+      - name: Log in to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Extract version from release tag
+        if: github.event_name == 'release'
+        id: version
+        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+
+      - name: Build and push ARM64 Docker image
+        if: github.ref == 'refs/heads/master' && github.event_name == 'push'
+        run: |
+          DOCKERFILE=app.dockerfile
+          IMAGE_NAME=perplexica
+          docker buildx build --platform linux/arm64 \
+            --cache-from=type=registry,ref=itzcrazykns1337/${IMAGE_NAME}:arm64 \
+            --cache-to=type=inline \
+            --provenance false \
+            -f $DOCKERFILE \
+            -t itzcrazykns1337/${IMAGE_NAME}:arm64 \
+            --push .
+
+      - name: Build and push ARM64 release Docker image
+        if: github.event_name == 'release'
+        run: |
+          DOCKERFILE=app.dockerfile
+          IMAGE_NAME=perplexica
+          docker buildx build --platform linux/arm64 \
+            --cache-from=type=registry,ref=itzcrazykns1337/${IMAGE_NAME}:${{ env.RELEASE_VERSION }}-arm64 \
+            --cache-to=type=inline \
+            --provenance false \
+            -f $DOCKERFILE \
+            -t itzcrazykns1337/${IMAGE_NAME}:${{ env.RELEASE_VERSION }}-arm64 \
+            --push .
+
+  manifest:
+    needs: [build-amd64, build-arm64]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Log in to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Create and push multi-arch manifest for main
+        if: github.ref == 'refs/heads/master' && github.event_name == 'push'
+        run: |
+          IMAGE_NAME=perplexica
+          docker manifest create itzcrazykns1337/${IMAGE_NAME}:main \
+            --amend itzcrazykns1337/${IMAGE_NAME}:amd64 \
+            --amend itzcrazykns1337/${IMAGE_NAME}:arm64
+          docker manifest push itzcrazykns1337/${IMAGE_NAME}:main
+
+      - name: Create and push multi-arch manifest for releases
+        if: github.event_name == 'release'
+        run: |
+          IMAGE_NAME=perplexica
+          docker manifest create itzcrazykns1337/${IMAGE_NAME}:${{ env.RELEASE_VERSION }} \
+            --amend itzcrazykns1337/${IMAGE_NAME}:${{ env.RELEASE_VERSION }}-amd64 \
+            --amend itzcrazykns1337/${IMAGE_NAME}:${{ env.RELEASE_VERSION }}-arm64
+          docker manifest push itzcrazykns1337/${IMAGE_NAME}:${{ env.RELEASE_VERSION }}

README.md

@@ -153,7 +153,7 @@ For more details, check out the full documentation [here](https://github.com/Itz
 
 ## Expose Perplexica to network
 
-You can access Perplexica over your home network by following our networking guide [here](https://github.com/ItzCrazyKns/Perplexica/blob/master/docs/installation/NETWORKING.md).
+Perplexica runs on Next.js and handles all API requests. It works right away on the same network and stays accessible even with port forwarding.
 
 ## One-Click Deployment
 

app.dockerfile

@@ -1,4 +1,4 @@
-FROM node:20.18.0-alpine AS builder
+FROM node:20.18.0-slim AS builder
 
 WORKDIR /home/perplexica
 
@@ -12,7 +12,7 @@ COPY public ./public
 RUN mkdir -p /home/perplexica/data
 RUN yarn build
 
-FROM node:20.18.0-alpine
+FROM node:20.18.0-slim
 
 WORKDIR /home/perplexica
 

src/app/api/config/route.ts

@@ -59,9 +59,9 @@ export const GET = async (req: Request) => {
 
     return Response.json({ ...config }, { status: 200 });
   } catch (err) {
-    console.error('An error ocurred while getting config:', err);
+    console.error('An error occurred while getting config:', err);
     return Response.json(
-      { message: 'An error ocurred while getting config' },
+      { message: 'An error occurred while getting config' },
       { status: 500 },
     );
   }
@@ -100,9 +100,9 @@ export const POST = async (req: Request) => {
 
     return Response.json({ message: 'Config updated' }, { status: 200 });
   } catch (err) {
-    console.error('An error ocurred while updating config:', err);
+    console.error('An error occurred while updating config:', err);
     return Response.json(
-      { message: 'An error ocurred while updating config' },
+      { message: 'An error occurred while updating config' },
       { status: 500 },
     );
   }