Merge branch '1.11'

ezpublishlegacy · Aug 27, 2017 · 300385e · 300385e
2 parents 23b13db + 475cf73
commit 300385e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -24,6 +24,3 @@ RUN mkdir -p web/var \
 # Remove composer cache to avoid it taking space in image
     && rm -rf ~/.composer/*/* \
     && [ "$REMOVE_AUTH" = "1" ] && rm -f auth.json
-
-# Declare volumes so it an can be shared with other containers
-VOLUME /var/www /var/www/web/var
diff --git a/doc/docker/Dockerfile-nginx b/doc/docker/Dockerfile-nginx
@@ -6,7 +6,10 @@ ENV SYMFONY_ENV=prod
 COPY . /var/www
 
 # Create asset directories that might not exists
+RUN if [ ! -d /var/www/web/bundles ]; then mkdir /var/www/web/bundles; fi
+RUN if [ ! -d /var/www/web/css ]; then mkdir /var/www/web/css; fi
 RUN if [ ! -d /var/www/web/fonts ]; then mkdir /var/www/web/fonts; fi
+RUN if [ ! -d /var/www/web/js ]; then mkdir /var/www/web/js; fi
 RUN if [ ! -d /var/www/web/assets ]; then mkdir /var/www/web/assets; fi
 
 # Generate assets using hard copy as we need to copy them over to resulting image