From d27e72b6e41cc7fa7b5053c5bd5cd3b64278489f Mon Sep 17 00:00:00 2001
From: Ari Timonen <arit@fastmail.com>
Date: Wed, 9 Oct 2019 22:04:09 +0300
Subject: [PATCH] Update Dockerfile

---
 Dockerfile         | 3 ++-
 docker-compose.yml | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index af6db94..44c92bf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -30,7 +30,8 @@ RUN bundle config github.https true; cd /var/www && bundle install --path /var/b
 RUN bundle exec rake assets:precompile
 
 # This is a temporary solution to fix assets issue
-RUN mv /var/www/public/assets /home/web/assets
 
 USER root
+RUN mv /var/www/public/assets /home/web/assets
+
 CMD ["/var/www/script/entry.sh"]
diff --git a/docker-compose.yml b/docker-compose.yml
index b78ad50..dcc24a7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   web:
     image: ensl/ensl.org:latest
     volumes:
-     - "./public:/var/www/public"
+     - "../public:/var/www/public"
     ports:
      - "4000:4000"
     depends_on:
@@ -13,6 +13,7 @@ services:
   #    - redis
   db:
     image: mariadb:latest
+    command: mysqld
     volumes:
      - "./db_data:/var/lib/mysql"
      - "./ext/mysql.conf.d:/etc/mysql/conf.d"