Merge pull request #37 from mariusihring/patch-1

feat: Update build.sh to provide arm64, aarch64 and x86 images

.github/workflows/pull-request.yml

@@ -75,7 +75,5 @@ jobs:
 
       - name: Build and push Docker image using custom script
         run: |
-          chmod +x ./docker/build.sh
           chmod +x ./docker/push.sh
-          ./docker/build.sh ${{ github.ref_name == 'canary' && 'canary' || '' }}
           ./docker/push.sh ${{ github.ref_name == 'canary' && 'canary' || '' }}

docker/build.sh

@@ -10,9 +10,8 @@ else
     TAG="$VERSION"
 fi
 
-docker build --platform linux/amd64 --pull --rm -f 'Dockerfile' -t "dokploy/dokploy:${TAG}" .
+BUILDER=$(docker buildx create --use)
 
-if [ "$BUILD_TYPE" != "canary" ]; then
-    # Tag the production build as latest
-    docker tag "dokploy/dokploy:${TAG}" "dokploy/dokploy:latest"
-fi
+docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 --pull --rm -t "dokploy/dokploy:${TAG}" -f 'Dockerfile' .
+
+docker buildx rm $BUILDER

docker/push.sh

@@ -3,13 +3,16 @@
 # Determine the type of build based on the first script argument
 BUILD_TYPE=${1:-production}
 
+BUILDER=$(docker buildx create --use)
+
 if [ "$BUILD_TYPE" == "canary" ]; then
     TAG="canary"
     echo PUSHING CANARY
-    docker push "dokploy/dokploy:${TAG}"
+        docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 --pull --rm -t "dokploy/dokploy:${TAG}" -f 'Dockerfile' --push .
 else
     echo  "PUSHING PRODUCTION"
     VERSION=$(node -p "require('./package.json').version")
-    docker push "dokploy/dokploy:${VERSION}"
-    docker push "dokploy/dokploy:latest"
+    docker buildx build --platform linux/amd64,linux/arm64,linux/arm/v7 --pull --rm -t "dokploy/dokploy:latest" -t "dokploy/dokploy:${VERSION}" -f 'Dockerfile' --push .
 fi
+
+docker buildx rm $BUILDER

next.config.mjs

@@ -6,11 +6,6 @@
 /** @type {import("next").NextConfig} */
 const nextConfig = {
   reactStrictMode: true,
-  logging:{
-    fetches:{
-      fullUrl:false
-    }
-  },
 
   /**
    * If you are using `appDir` then you must comment the below `i18n` config out.

package.json

@@ -78,7 +78,7 @@
     "lucia": "^3.0.1",
     "lucide-react": "^0.312.0",
     "nanoid": "3",
-    "next": "^14.1.3",
+    "next": "^13.2.4",
     "next-themes": "^0.2.1",
     "node-os-utils": "1.3.7",
     "node-pty": "1.0.0",