|
|
@@ -13,22 +13,24 @@ RUN a2disconf other-vhosts-access-log
|
|
|
RUN a2enmod rewrite headers rewrite expires cache
|
|
|
|
|
|
# configure mod_php
|
|
|
+# default_charset is set due to https://www.saotn.org/php-56-default_charset-change-may-break-html-output/
|
|
|
RUN crudini --set /etc/php/7.3/apache2/php.ini PHP upload_max_filesize 64M && \
|
|
|
crudini --set /etc/php/7.3/apache2/php.ini PHP post_max_size 64M && \
|
|
|
crudini --set /etc/php/7.3/apache2/php.ini PHP memory_limit 128M && \
|
|
|
- crudini --set /etc/php/7.3/apache2/php.ini Session session.save_path /run/app/sessions && \
|
|
|
+ crudini --set /etc/php/7.3/apache2/php.ini Session session.save_path /run/sessions && \
|
|
|
crudini --set /etc/php/7.3/apache2/php.ini Session session.gc_probability 1 && \
|
|
|
- crudini --set /etc/php/7.3/apache2/php.ini Session session.gc_divisor 100
|
|
|
+ crudini --set /etc/php/7.3/apache2/php.ini Session session.gc_divisor 100 && \
|
|
|
+ crudini --set /etc/php/7.3/apache2/php.ini PHP default_charset ""
|
|
|
|
|
|
# supervisor# configure supervisor
|
|
|
ADD supervisor/ /etc/supervisor/conf.d/
|
|
|
RUN sed -e 's,^logfile=.*$,logfile=/run/supervisord.log,' -i /etc/supervisor/supervisord.conf
|
|
|
|
|
|
-# copy app code
|
|
|
-ADD app /app/code/
|
|
|
+# copy website code mind the trailing slash to copy its content to /app/code/ not the folder itself
|
|
|
+ADD website/ /app/code/
|
|
|
|
|
|
-# copy website code
|
|
|
-ADD website /app/code/
|
|
|
+# copy app code
|
|
|
+ADD app /app/code/app
|
|
|
|
|
|
RUN chown -R www-data.www-data /app/code
|
|
|
|