From bf6a0dc199400774109d7beac4ad634893d86887 Mon Sep 17 00:00:00 2001
From: sneak <sneak@sneak.berlin>
Date: Sat, 7 Dec 2019 21:46:17 -0800
Subject: [PATCH] should buildshould build

---
 Dockerfile                       | 10 +++++++---
 install.sh                       | 26 ++++++++++++++++++++++++++
 setup.sh => prereqs.sh           | 17 +----------------
 rootfs/etc/service/postgres/run  |  0
 rootfs/etc/service/redis/run     |  0
 rootfs/etc/service/sidekiq/run   |  0
 rootfs/etc/service/streaming/run |  0
 rootfs/etc/service/web/run       |  0
 8 files changed, 34 insertions(+), 19 deletions(-)
 create mode 100644 install.sh
 rename setup.sh => prereqs.sh (72%)
 create mode 100644 rootfs/etc/service/postgres/run
 create mode 100644 rootfs/etc/service/redis/run
 create mode 100644 rootfs/etc/service/sidekiq/run
 create mode 100644 rootfs/etc/service/streaming/run
 create mode 100644 rootfs/etc/service/web/run

diff --git a/Dockerfile b/Dockerfile
index a43b1a9..d17131e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,10 +3,14 @@ FROM phusion/baseimage:0.11
 # Use baseimage-docker's init system.
 CMD ["/sbin/my_init"]
 
-ADD setup.sh /tmp/setup.sh
+# install os prereq stuff to image
+ADD prereqs.sh /tmp/prereqs.sh
+RUN bash /tmp/prereqs.sh
 
-# install stuff to image
-RUN bash /tmp/setup.sh
+# install mastodon:
+ADD install.sh /tmp/install.sh
+
+RUN chpst -u mastodon:mastodon bash /tmp/install.sh
 
 ADD ./rootfs /
 
diff --git a/install.sh b/install.sh
new file mode 100644
index 0000000..c3dde69
--- /dev/null
+++ b/install.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+export HOME="/mastodon"
+export PATH="$HOME/.rbenv/bin:$PATH"
+export RUBY_CONFIGURE_OPTS="--with-jemalloc"
+
+git clone https://github.com/rbenv/rbenv.git $HOME/.rbenv
+cd $HOME/.rbenv && src/configure && make -C src
+echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> $HOME/.bashrc
+echo 'eval "$(rbenv init -)"' >> $HOME/.bashrc
+git clone https://github.com/rbenv/ruby-build.git ~/.rbenv/plugins/ruby-build
+eval "$(rbenv init -)"
+rbenv install 2.6.1
+rbenv global 2.6.1
+gem update --system
+gem install bundler --no-document
+
+git clone https://github.com/tootsuite/mastodon.git /mastodon/app
+cd /mastodon/app
+# v3.0.1:
+git checkout c4118ba71ba31e408c02d289e111326ccc6f6aa2
+
+bundle install \
+  -j$(getconf _NPROCESSORS_ONLN) \
+  --deployment --without development test
+yarn install --pure-lockfile
diff --git a/setup.sh b/prereqs.sh
similarity index 72%
rename from setup.sh
rename to prereqs.sh
index 5536d7a..c5748b1 100644
--- a/setup.sh
+++ b/prereqs.sh
@@ -61,20 +61,5 @@ apt install -y \
   yarn \
   zlib1g-dev
 
-addgroup -g 991 mastodon
+addgroup --gid 991 mastodon
 useradd --uid 991 --gid 991 -m -d /mastodon mastodon
-
-exit 0
-
-su - mastodon <<'EOF'
-git clone https://github.com/rbenv/rbenv.git ~/.rbenv
-cd ~/.rbenv && src/configure && make -C src
-echo 'export PATH="$HOME/.rbenv/bin:$PATH"' >> ~/.bashrc
-echo 'eval "$(rbenv init -)"' >> ~/.bashrc
-source ~/.bashrc
-git clone https://github.com/rbenv/ruby-build.git ~/.rbenv/plugins/ruby-build
-RUBY_CONFIGURE_OPTS=--with-jemalloc rbenv install 2.6.1
-rbenv global 2.6.1
-gem update --system
-gem install bundler --no-document
-EOF
diff --git a/rootfs/etc/service/postgres/run b/rootfs/etc/service/postgres/run
new file mode 100644
index 0000000..e69de29
diff --git a/rootfs/etc/service/redis/run b/rootfs/etc/service/redis/run
new file mode 100644
index 0000000..e69de29
diff --git a/rootfs/etc/service/sidekiq/run b/rootfs/etc/service/sidekiq/run
new file mode 100644
index 0000000..e69de29
diff --git a/rootfs/etc/service/streaming/run b/rootfs/etc/service/streaming/run
new file mode 100644
index 0000000..e69de29
diff --git a/rootfs/etc/service/web/run b/rootfs/etc/service/web/run
new file mode 100644
index 0000000..e69de29