Update Dockerfile

Dockerfile

@@ -40,16 +40,82 @@ RUN apt-get install -y php7.1 php7.1-common libapache2-mod-php7.1 php7.1-mcrypt
 RUN apt-get clean -y
 RUN rm -rf /var/lib/apt/lists/*
  
-RUN \
-  service apache2 restart && \
-  rm -R -f /var/www && \
-  ln -s -v /web /var/www
+RUN service apache2 restart
+RUN rm -R -f /var/www
+#RUN ln -s -v /web /var/www
   
 ADD https://www.opensource-socialnetwork.org/download_ossn/latest/build.zip /tmp/build.zip
 RUN unzip /tmp/build.zip -d /tmp
 RUN cp -R /tmp/ossn/. /var/www/html/ossn
-RUN ls /
-RUN ls /var
-RUN ls /var/www
-RUN ls /web
 
+RUN chown -R www-data:www-data /var/www/html/ossn/
+RUN chmod -R 755 /var/www/html/ossn/
+RUN chown -R www-data:www-data /var/www/html/ossn_data
+  
+# Update apache configuration with this one
+RUN \
+  mv /etc/apache2/sites-available/000-default.conf /etc/apache2/000-default.conf && \
+  rm /etc/apache2/sites-available/* && \
+  rm /etc/apache2/apache2.conf && \
+  ln -s /config/proxy-config.conf /etc/apache2/sites-available/000-default.conf && \
+  ln -s /var/log/apache2 /logs
+
+# Update ossn.config.db configs with variables
+RUN \
+  set 's/<<host>>/${DBHost}/g' ossn.config.db && \
+  set 's/<<port>>/${DBPort}/g' ossn.config.db && \
+  set 's/<<password>>/${DBPassword}/g' ossn.config.db && \
+  set 's/<<dbname>>/${DBUsername}/g' ossn.config.db
+
+# Update ossn.config.site configs with variables
+RUN \
+  set 's/<<siteurl>>/${SiteURL}/g' ossn.config.site && \
+  set 's/<<datadir>>/${DataDirectory}/g' ossn.config.site
+
+# Update ossn.conf configs with variables
+RUN \
+  set 's/<<admin@server>>/${adminlogin}/g' ossn.conf && \
+  set 's/<<servername>>/${servername}/g' ossn.conf
+  
+ADD ossn.conf /etc/apache2/000-default.conf
+ADD apache2.conf /etc/apache2/apache2.conf
+ADD ports.conf /etc/apache2/ports.conf
+ADD ossn.config.db /var/www/html/ossn/configuration/ossn.config.db
+ADD ossn.config.site /var/www/html/ossn/configuration/ossn.config.site
+
+# Manually set the apache environment variables in order to get apache to work immediately.
+RUN \
+echo www-data > /etc/container_environment/APACHE_RUN_USER && \
+echo www-data > /etc/container_environment/APACHE_RUN_GROUP && \
+echo /var/log/apache2 > /etc/container_environment/APACHE_LOG_DIR && \
+echo /var/lock/apache2 > /etc/container_environment/APACHE_LOCK_DIR && \
+echo /var/run/apache2.pid > /etc/container_environment/APACHE_PID_FILE && \
+echo /var/run/apache2 > /etc/container_environment/APACHE_RUN_DIR
+
+# Expose Ports
+EXPOSE 80 443
+
+# The www directory and proxy config location
+#VOLUME ["/config", "/web", "/logs"]
+VOLUME ["/config", "/logs", "/data"]
+
+# Add our crontab file
+ADD crons.conf /root/crons.conf
+
+# Add firstrun.sh to execute during container startup
+ADD firstrun.sh /etc/my_init.d/firstrun.sh
+RUN chmod +x /etc/my_init.d/firstrun.sh
+
+# Add inotify.sh to execute during container startup
+RUN mkdir /etc/service/inotify
+ADD inotify.sh /etc/service/inotify/run
+RUN chmod +x /etc/service/inotify/run
+
+# Add apache to runit
+RUN mkdir /etc/service/apache
+ADD apache-run.sh /etc/service/apache/run
+RUN chmod +x /etc/service/apache/run
+ADD apache-finish.sh /etc/service/apache/finish
+RUN chmod +x /etc/service/apache/finish
+
+RUN a2enmod rewrite