From 398984623580009087bbeff95bfbc30e6c43946c Mon Sep 17 00:00:00 2001
From: Ari Timonen <arit@fastmail.com>
Date: Sun, 15 Apr 2018 12:59:57 +0000
Subject: [PATCH] Update dockerfile

Remove .env reference, clean up
---
 Dockerfile | 20 +++++---------------
 test.sh    |  0
 2 files changed, 5 insertions(+), 15 deletions(-)
 mode change 100644 => 100755 test.sh

diff --git a/Dockerfile b/Dockerfile
index eb9b3b6..3b742fa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,6 +7,7 @@ RUN adduser web --home /home/web --shell /bin/bash --disabled-password --gecos "
 
 RUN apt-get update && apt-get -y upgrade
 RUN apt-get -y install mysql-client libmysqlclient-dev memcached nodejs
+RUN service memcached start
 
 # Separate Gemfile ADD so that `bundle install` can be cached more effectively
 
@@ -16,29 +17,18 @@ RUN chown -R web:web /var/www &&\
     mkdir -p /var/bundle &&\
     chown -R web:web /var/bundle
 
-RUN bundle config github.https true
-RUN su -c "cd /var/www && bundle install --path /var/bundle" -s /bin/bash -l web
+RUN su -c "bundle config github.https true; cd /var/www && bundle install --path /var/bundle --jobs 4" -s /bin/bash -l web
 
 # Add application source
 ADD . /var/www
 RUN chown -R web:web /var/www
 
-USER web
-
 # Precompile assets
-
-WORKDIR /var/www
-COPY .env /var/www/
-RUN bundle install --path /var/bundle --jobs 4
+#WORKDIR /var/www
 #RUN bundle exec rake assets:precompile
 
-USER root
-
-# FIXME: move this to docker image
-RUN apt-get install -y memcached
-RUN service memcached start
-
-#USER root
+# for debug
+# USER root
 
 USER web
 CMD ["/var/www/entry.sh"]
diff --git a/test.sh b/test.sh
old mode 100644
new mode 100755