From b4eb525f96b191c577dcfc8fe7c91ff5998248bd Mon Sep 17 00:00:00 2001
From: asonix <asonix@asonix.dog>
Date: Mon, 14 Oct 2019 22:19:35 -0500
Subject: [PATCH] Make tini work

---
 Dockerfile      | 14 ++++++++------
 build-images.sh |  3 +--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c237b42f4..41b390dca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -90,9 +90,7 @@ RUN apt -y --no-install-recommends install \
 	  file ca-certificates tzdata libreadline7 && \
 	apt -y install gcc && \
 	ln -s /opt/mastodon /mastodon && \
-	gem install bundler && \
-	rm -rf /var/cache && \
-	rm -rf /var/lib/apt/lists/*
+	gem install bundler
 
 # Add tini
 ENV TINI_VERSION="0.18.0"
@@ -102,11 +100,15 @@ ADD https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini-${TI
 
 RUN apt update && \
         apt -y --no-install-recommends install gpg gpg-agent dirmngr && \
-        gpg --batch \
+	rm -rf /var/cache && \
+	rm -rf /var/lib/apt/lists/*
+
+RUN gpg --batch \
           --keyserver hkp://p80.pool.sks-keyservers.net:80 \
           --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && \
-        gpg --batch --verify /tini.asc /tini && \
-        chmod +x /tini
+        gpg --batch --verify /tini.asc /tini
+
+RUN chmod +rx /tini
 
 # Copy over mastodon source, and dependencies from building, and set permissions
 COPY --chown=mastodon:mastodon . /opt/mastodon
diff --git a/build-images.sh b/build-images.sh
index 85d1fbddb..2e08cf7b7 100755
--- a/build-images.sh
+++ b/build-images.sh
@@ -16,8 +16,7 @@ require_input() {
 
 require_input "$TAG" "container tag"
 
-# architectures=('amd64' 'arm32v7' 'arm64v8')
-architectures=('arm64v8')
+architectures=('arm64v8' 'arm32v7' 'amd64')
 
 for architecture in "${architectures[@]}"; do
     sed "s/FROM ubuntu/FROM $architecture\/ubuntu/g" Dockerfile > "Dockerfile-$architecture"