From: Dessalines <tyhou13@gmx.com>
Date: Thu, 18 Jun 2020 02:32:18 +0000 (-0400)
Subject: Fixing deploy.sh
X-Git-Url: http://these/git/%7B%60%24%7BwebArchiveUrl%7D/%22%7B%7D/%22https:/nerdica.net/README.ja.md?a=commitdiff_plain;h=ceb1284f2733a8fc5e089be823bc109034589cfe;p=lemmy.git

Fixing deploy.sh
---

diff --git a/docker/prod/deploy.sh b/docker/prod/deploy.sh
index 4cd55c26..2c6e3d31 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
@@ -38,19 +38,17 @@ export DOCKER_BUILDKIT=1
 
 # Rebuilding docker
 if [ $third_semver -eq 0 ]; then
-  docker buildx build --platform linux/amd64 ../../ \
-    --file Dockerfile \
-    --tag dessalines/lemmy:$new_tag \
-    --file docker/dev/Dockerfile.m \
-    --push .
-else
   # 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 .
+    --push
+else
+  docker buildx build --platform linux/amd64 ../../ \
+    --file Dockerfile \
+    --tag dessalines/lemmy:$new_tag \
+    --push
 fi
 
 # Push