Fixing Docker and Config

Author: devinmatte

Dockerfile

@@ -1,20 +1,18 @@
 FROM php:7.1-apache
 MAINTAINER Devin Matte <[email protected]>
 
-EXPOSE 8080
-EXPOSE 8443
-
-RUN a2enmod rewrite && a2enmod headers && a2enmod expires
-
-RUN sed -i '/Listen/{s/\([0-9]\+\)/8080/; :a;n; ba}' /etc/apache2/ports.conf
-
 ADD apache-config.conf /etc/apache2/sites-enabled/000-default.conf
 
+RUN a2enmod rewrite && a2enmod headers && a2enmod expires && \
+    sed -i '/Listen/{s/\([0-9]\+\)/8080/; :a;n; ba}' /etc/apache2/ports.conf && \
+    chmod og+rwx /var/lock/apache2 && chmod -R og+rwx /var/run/apache2
+
 RUN apt-get -yq update && \
-    apt-get -yq install gnupg libmagickwand-dev --no-install-recommends
+    apt-get -yq install gnupg libmagickwand-dev --no-install-recommends && \
+    apt-get -yq clean all
 
-RUN docker-php-ext-install mysqli
-RUN pecl install imagick && docker-php-ext-enable imagick
+RUN docker-php-ext-install mysqli && \
+    pecl install imagick && docker-php-ext-enable imagick
 
 COPY . /var/www/html
 
@@ -24,7 +22,8 @@ RUN curl -sL https://deb.nodesource.com/setup_6.x | bash - && \
     npm install && \
     npm run-script build && \
     rm -rf node_modules && \
-    apt-get -yq remove nodejs npm && \
+    apt-get -yq remove nodejs && \
     apt-get -yq clean all
 
-RUN chmod og+rwx /var/lock/apache2 && chmod -R og+rwx /var/run/apache2
+EXPOSE 8080
+EXPOSE 8443

inc/config.env.php

@@ -12,11 +12,11 @@
 $DATABASE_USER   = $get_env(getenv("DATABASE_USER"), '');
 $DATABASE_PASS   = $get_env(getenv("DATABASE_PASS"), '');
 $DATABASE_DB     = $get_env(getenv("DATABASE_DB"), '');
-$DUMPCLASSES     = '/mnt/share/cshclass.dat';
-$DUMPCLASSATTR   = '/mnt/share/cshattrib.dat';
-$DUMPINSTRUCT    = '/mnt/share/cshinstr.dat';
-$DUMPMEETING     = '/mnt/share/cshmtgpat.dat';
-$DUMPNOTES       = '/mnt/share/cshnotes.dat';
+$DUMPCLASSES     = $get_env(getenv("DUMPCLASSES"), '/mnt/share/cshclass.dat');
+$DUMPCLASSATTR   = $get_env(getenv("DUMPCLASSATTR"), '/mnt/share/cshattrib.dat');
+$DUMPINSTRUCT    = $get_env(getenv("DUMPINSTRUCT"), '/mnt/share/cshinstr.dat');
+$DUMPMEETING     = $get_env(getenv("DUMPMEETING"), '/mnt/share/cshmtgpat.dat');
+$DUMPNOTES       = $get_env(getenv("DUMPNOTES"), '/mnt/share/cshnotes.dat');
 
 $HTTPROOTADDRESS = $get_env(getenv("HTTPROOTADDRESS"), 'http://schedule.csh.rit.edu/');
 $SERVER_TYPE     = $get_env(getenv("SERVER_TYPE"), 'development');