From 68c983923eeb0011d0a061ab3133a0a690f47ee3 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Wed, 12 Oct 2022 14:08:00 +0200
Subject: [PATCH] fix: dockerfile

---
 .github/workflows/staging-release.yml | 34 +++------------------------
 Dockerfile                            | 16 ++++++-------
 2 files changed, 11 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/staging-release.yml b/.github/workflows/staging-release.yml
index 42e8f26dc..2280167d8 100644
--- a/.github/workflows/staging-release.yml
+++ b/.github/workflows/staging-release.yml
@@ -59,40 +59,12 @@ jobs:
           context: .
           platforms: linux/amd64
           push: true
-          tags: coollabsio/coolify:next-amd64 
+          tags: coollabsio/coolify:next-amd64
           cache-from: type=registry,ref=coollabsio/coolify:buildcache-next-amd64
           cache-to: type=registry,ref=coollabsio/coolify:buildcache-next-amd64,mode=max
-  aarch64:
-    runs-on: [self-hosted, arm64]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          ref: "next"
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Get current package version
-        uses: martinbeentjes/npm-get-version-action@v1.2.3
-        id: package-version
-      - name: Build and push
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          platforms: linux/aarch64
-          push: true
-          tags: coollabsio/coolify:next-aarch64
-          cache-from: type=registry,ref=coollabsio/coolify:buildcache-next-aarch64
-          cache-to: type=registry,ref=coollabsio/coolify:buildcache-next-aarch64,mode=max
   merge-manifest:
     runs-on: ubuntu-latest
-    needs: [arm64, amd64, aarch64]
+    needs: [arm64, amd64]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -107,7 +79,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Create & publish manifest
         run: |
-          docker manifest create coollabsio/coolify:next --amend coollabsio/coolify:next-amd64 --amend coollabsio/coolify:next-arm64 --amend coollabsio/coolify:next-aarch64
+          docker manifest create coollabsio/coolify:next --amend coollabsio/coolify:next-amd64 --amend coollabsio/coolify:next-arm64
           docker manifest push coollabsio/coolify:next
       - uses: sarisia/actions-status-discord@v1
         if: always()
diff --git a/Dockerfile b/Dockerfile
index 2f14248dc..8cbc68037 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,4 @@
 ARG PNPM_VERSION=7.11.0
-ARG NPM_VERSION=8.19.1
-# https://download.docker.com/linux/static/stable/
-ARG DOCKER_VERSION=20.10.18
-# https://github.com/docker/compose/releases
-# Reverted to 2.6.1 because of this https://github.com/docker/compose/issues/9704. 2.9.0 still has a bug.
-ARG DOCKER_COMPOSE_VERSION=2.6.1
-# https://github.com/buildpacks/pack/releases
-ARG PACK_VERSION=v0.27.0
 
 FROM node:18-slim as build
 WORKDIR /app
@@ -24,6 +16,14 @@ WORKDIR /app
 ENV NODE_ENV production
 ARG TARGETPLATFORM
 
+# https://download.docker.com/linux/static/stable/
+ARG DOCKER_VERSION=20.10.18
+# https://github.com/docker/compose/releases
+# Reverted to 2.6.1 because of this https://github.com/docker/compose/issues/9704. 2.9.0 still has a bug.
+ARG DOCKER_COMPOSE_VERSION=2.6.1
+# https://github.com/buildpacks/pack/releases
+ARG PACK_VERSION=v0.27.0
+
 RUN apt update && apt -y install --no-install-recommends ca-certificates git git-lfs openssh-client curl jq cmake sqlite3 openssl psmisc python3
 RUN apt-get clean autoclean && apt-get autoremove --yes && rm -rf /var/lib/{apt,dpkg,cache,log}/
 RUN npm --no-update-notifier --no-fund --global install pnpm@${PNPM_VERSION}