working backend

backend/Dockerfile

@@ -6,13 +6,20 @@ MAINTAINER Robin Thoni <robin@rthoni.com>
 ARG CONFIG_DIR=/etc/default/config-files/
 
 RUN apt-get update && apt-get -y install\
+        curl\
+        git\
+        unzip\
         apache2=2.4.*\
         libapache2-mod-php5\
         php5\
         php5-mcrypt\
+        php5-imagick\
         php5-gd &&\
         apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
+RUN curl https://getcomposer.org/composer.phar -o /usr/local/bin/composer \
+        && chmod +x /usr/local/bin/composer
+
 RUN /usr/sbin/a2enmod rewrite &&\
     rm -rf /var/www/html &&\
     mkdir -p /var/lock/apache2 /var/run/apache2 /var/log/apache2 /var/www/html &&\
@@ -28,6 +35,13 @@ COPY apache2.conf /etc/apache2/apache2.conf
 
 COPY ./backend/ /var/www/html/
 
+RUN cd /var/www/html && composer install
+
+COPY env "${CONFIG_DIR}"
+
+RUN chmod -R 777 /var/www/html/storage/
+        #&& ln -s /dev/stdout /var/www/html/storage/logs/lumen.log
+
 COPY ./vars-vars /etc/vars-vars
 
 COPY ./vars-files /etc/vars-files
@@ -36,8 +50,6 @@ COPY ./common.sh /common.sh
 
 COPY ./run.sh /run.sh
 
-RUN mkdir "${CONFIG_DIR}"
-
 EXPOSE 80
 
 CMD ["/run.sh"]

backend/apache2.conf

@@ -25,7 +25,7 @@ Listen 80
     Listen 443
 </IfModule>
 
-DocumentRoot "/var/www/html/"
+DocumentRoot "/var/www/html/public/"
 
 <Directory />
     Options FollowSymLinks
@@ -33,7 +33,7 @@ DocumentRoot "/var/www/html/"
     Require all denied
 </Directory>
 
-<Directory /var/www/html/>
+<Directory /var/www/html/public/>
     Options FollowSymLinks
     AllowOverride All
     Require all granted

backend/env

@@ -0,0 +1 @@
+TOKEN=CM_BACKEND_TOKEN

backend/vars-files

@@ -1 +1 @@
-/var/www/html/env
+env /var/www/html/.env

docker-compose.yml

@@ -19,6 +19,7 @@ services:
     backend:
         build: ./backend
         container_name: backend-camotion
+#        restart: unless-stopped
         networks:
             camotion.internal.docker:
                 aliases:

env

@@ -1 +1 @@
-CM_BACKEND_TOKEN=change_it
+CM_BACKEND_TOKEN=ed249efcda48a07071e2a341fef8759f1bfafeae