From e4666cd95cb912f332462910860a36bc99308b04 Mon Sep 17 00:00:00 2001
From: Dessalines <tyhou13@gmx.com>
Date: Thu, 31 Oct 2019 20:03:43 -0700
Subject: [PATCH] Fixing rest of deploy.

---
 docker/dev/Dockerfile.armv7hf  |  3 +-
 docker/dev/d                   | 62 ----------------------------------
 docker/dev/deploy.sh           | 26 ++++++++++++--
 docker/prod/docker-compose.yml |  2 +-
 4 files changed, 27 insertions(+), 66 deletions(-)
 delete mode 100755 docker/dev/d

diff --git a/docker/dev/Dockerfile.armv7hf b/docker/dev/Dockerfile.armv7hf
index 85b6001b..3770dfd7 100644
--- a/docker/dev/Dockerfile.armv7hf
+++ b/docker/dev/Dockerfile.armv7hf
@@ -35,7 +35,8 @@ COPY server/Cargo.toml server/Cargo.lock ./
 RUN  mkdir -p ./src/bin \
   && echo 'fn main() { println!("Dummy") }' > ./src/bin/main.rs
 #RUN cargo build --release
-RUN cargo build
+# RUN cargo build
+  RUN RUSTFLAGS='-Ccodegen-units=1' cargo build
 COPY server/src ./src/
 COPY server/migrations ./migrations/
 RUN rm -f ./target/release/deps/lemmy_server* ; rm -f ./target/debug/deps/lemmy_server*
diff --git a/docker/dev/d b/docker/dev/d
deleted file mode 100755
index 6fdfc8fb..00000000
--- a/docker/dev/d
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash -x
-
-#git checkout master
-
-# Creating the new tag
-new_tag="$1"
-#git tag $new_tag
-
-# Setting the version on the front end
-pushd ../../ui/
-node set_version.js
-#git add src/version.ts
-popd
-
-# Changing the docker-compose prod
-sed -i "s/dessalines\/lemmy:.*/dessalines\/lemmy:$new_tag/" ../prod/docker-compose.yml
-#git add ../prod/docker-compose.yml
-
-# The commit
-#git commit -m"Upping version."
-
-#git push origin $new_tag
-#git push
-
-# Rebuilding docker
-docker-compose build
-docker tag dev_lemmy:latest shtripok/lemmy:x64-$new_tag
-docker push shtripok/lemmy:x64-$new_tag
-
-# Build for Raspberry Pi armv7hf
-docker build -t lemmy:armv7hf -f Dockerfile.armv7hf ../../
-docker tag lemmy:armv7hf shtripok/lemmy:armv7hf-$new_tag
-docker push shtripok/lemmy:armv7hf-$new_tag
-
-
-docker build -t lemmy:aarch64 -f Dockerfile.aarch64 ../../
-docker tag lemmy:aarch64 shtripok/lemmy:arm64-$new_tag
-docker push shtripok/lemmy:arm-$new_tag
-
-docker manifest create shtripok/lemmy:latest \
-    shtripok/lemmy:armv7hf-$new_tag \
-    shtripok/lemmy:x64-$new_tag \
-    shtripok/lemmy:arm64-$new_tag
-
-
-#docker manifest create shtripok/pictshare:latest \
-#shtripok/pictshare:armv7 \
-#shtripok/pictshare:x64 \
-#shtripok/pictshare:arm64
-
-docker manifest push shtripok/pictshare:latest
-
-# Rebuilding the docker nocross
-# pushd ../nocross
-# docker-compose build
-# docker tag nocross_lemmy:latest dessalines/lemmy:nocross-$new_tag
-# docker push dessalines/lemmy:$new_tag
-# popd
-
-# Pushing to any ansible deploys
-#cd ../../ansible
-#ansible-playbook lemmy.yml --become
diff --git a/docker/dev/deploy.sh b/docker/dev/deploy.sh
index 3027a93a..4784a742 100755
--- a/docker/dev/deploy.sh
+++ b/docker/dev/deploy.sh
@@ -21,10 +21,32 @@ git commit -m"Version $new_tag"
 git push origin $new_tag
 git push
 
+# Registering qemu binaries
+docker run --rm --privileged multiarch/qemu-user-static:register --reset
+
 # Rebuilding docker
 docker-compose build
-docker tag dev_lemmy:latest dessalines/lemmy:$new_tag
-docker push dessalines/lemmy:$new_tag
+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
+docker build -t lemmy:aarch64 -f Dockerfile.aarch64 ../../
+docker tag lemmy:aarch64 dessalines/lemmy:arm64-$new_tag
+docker push dessalines/lemmy:arm64-$new_tag
+
+# Creating the manifest for the multi-arch build
+docker manifest create dessalines/lemmy:$new_tag \
+  dessalines/lemmy:x64-$new_tag \
+  dessalines/lemmy:arm64-$new_tag
+
+docker manifest push dessalines/lemmy:$new_tag
 
 # Pushing to any ansible deploys
 cd ../../ansible
diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml
index 67fb184e..481958c0 100644
--- a/docker/prod/docker-compose.yml
+++ b/docker/prod/docker-compose.yml
@@ -10,7 +10,7 @@ services:
     volumes:
       - lemmy_db:/var/lib/postgresql/data
   lemmy:
-    image: dessalines/lemmy:v0.3.0.8
+    image: dessalines/lemmy:v0.3.0.9
     ports:
       - "127.0.0.1:8536:8536"
     environment: