1 files changed, 13 insertions, 31 deletions
diff --git a/docker/prod/deploy.sh b/docker/prod/deploy.sh
index 0ad47bcd..4cd55c26 100755
--- a/docker/prod/deploy.sh
+++ b/docker/prod/deploy.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 set -e
-git checkout master
+# git checkout master
 
 # Import translations
 git fetch weblate
@@ -37,40 +37,22 @@ export COMPOSE_DOCKER_CLI_BUILD=1
 export DOCKER_BUILDKIT=1
 
 # Rebuilding docker
-docker-compose build
-docker tag dev_lemmy:latest dessalines/lemmy:x64-$new_tag
-docker push dessalines/lemmy:x64-$new_tag
-
-# Build for Raspberry Pi / other archs
-
-# Arm currently not working
-# docker build -t lemmy:armv7hf -f Dockerfile.armv7hf ../../
-# docker tag lemmy:armv7hf dessalines/lemmy:armv7hf-$new_tag
-# docker push dessalines/lemmy:armv7hf-$new_tag
-
-# aarch64
-# Only do this on major releases (IE the third semver is 0)
-if [ $third_semver -eq 0 ]; then
-  # Registering qemu binaries
-  docker run --rm --privileged multiarch/qemu-user-static:register --reset
-
-  docker build -t lemmy:aarch64 -f Dockerfile.aarch64 ../../
-  docker tag lemmy:aarch64 dessalines/lemmy:arm64-$new_tag
-  docker push dessalines/lemmy:arm64-$new_tag
-fi
-
-# Creating the manifest for the multi-arch build
 if [ $third_semver -eq 0 ]; then
-  docker manifest create dessalines/lemmy:$new_tag \
-  dessalines/lemmy:x64-$new_tag \
-  dessalines/lemmy:arm64-$new_tag
+  docker buildx build --platform linux/amd64 ../../ \
+    --file Dockerfile \
+    --tag dessalines/lemmy:$new_tag \
+    --file docker/dev/Dockerfile.m \
+    --push .
 else
-  docker manifest create dessalines/lemmy:$new_tag \
-  dessalines/lemmy:x64-$new_tag
+  # TODO get linux/arm/v7 build working
+  # Build for Raspberry Pi / other archs too
+  docker buildx build --platform linux/amd64,linux/arm64 ../../ \
+    --file Dockerfile \
+    --tag dessalines/lemmy:$new_tag \
+    --file docker/dev/Dockerfile.m \
+    --push .
 fi
 
-docker manifest push dessalines/lemmy:$new_tag
-
 # Push
 git push origin $new_tag
 git push