From 1fce679402a523d2887ad94c6078e4bd2bf67719 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Fri, 5 Jul 2019 15:24:11 +0200
Subject: [PATCH] misc: minor improvements on data storage on production images

---
 docker/backend/Dockerfile    | 4 ++--
 docker/backend/entrypoint.sh | 5 ++++-
 docker/docker-compose.yml    | 4 +++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile
index 4daae1039..913023915 100644
--- a/docker/backend/Dockerfile
+++ b/docker/backend/Dockerfile
@@ -10,6 +10,7 @@ RUN set -ex; \
     apt-get update -yq &&  \
     apt-get install -yq \
         curl \
+        rsync \
         git \
         imagemagick \
         webp
@@ -25,9 +26,8 @@ COPY ./dist /srv/uxbox
 
 RUN set -ex; \
     chmod 755 /entrypoint.sh; \
-    mkdir -p /srv/uxbox/resources/media
+    mkdir /srv/uxbox/data;
 
-VOLUME /srv/uxbox/resources/public
 WORKDIR /srv/uxbox/
 
 EXPOSE 6060
diff --git a/docker/backend/entrypoint.sh b/docker/backend/entrypoint.sh
index 06f253d4c..9e45fe9f1 100644
--- a/docker/backend/entrypoint.sh
+++ b/docker/backend/entrypoint.sh
@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 set -e
-echo "Setting up UXBOX Backend..."
 
+echo "Synchronize static data..."
+rsync -avr --delete ./resources/public/static/ ./data/static/
+
+echo "Setting up UXBOX Backend..."
 exec "$@"
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 56f62f382..202103207 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -36,7 +36,7 @@ services:
     ports:
       - 6060
     volumes:
-      - backend_data:/srv/uxbox/resources/public
+      - backend_data:/srv/uxbox/data
       - backend_m2:/root/.m2
       # - /etc/localtime:/etc/localtime:ro
       # - /etc/timezone:/etc/timezone:ro
@@ -46,6 +46,8 @@ services:
       - UXBOX_HTTP_SERVER_DEBUG=false
       - UXBOX_MEDIA_URI="/media/"
       - UXBOX_ASSETS_URI="/static/"
+      - UXBOX_MEDIA_DIRECTORY="data/media"
+      - UXBOX_ASSETS_DIRECTORY="data/static"
       # Database setup
       - UXBOX_DATABASE_USERNAME="uxbox"
       - UXBOX_DATABASE_PASSWORD="uxbox_postgres_password"