1
0
mirror of https://github.com/typemill/typemill.git synced 2025-01-29 11:09:05 +01:00

Functional without volume

This commit is contained in:
matbgn 2022-05-18 22:04:02 +02:00
parent 487b8e3a89
commit 24b1042545
4 changed files with 39 additions and 31 deletions

View File

@ -12,34 +12,40 @@ RUN docker-php-ext-install gd
COPY docker-utils /usr/local/bin
WORKDIR /src
#WORKDIR /src
#
#COPY system ./system
#COPY .htaccess \
# composer* \
# index.php \
# /src/
#COPY cache ./cache
#COPY data ./data
#COPY media ./media
#COPY settings ./settings
#COPY themes ./themes
COPY system ./system
COPY .htaccess \
composer* \
index.php \
/src/
COPY cache ./cache
COPY data ./data
COPY media ./media
COPY settings ./settings
COPY themes ./themes
#WORKDIR /tmp
#
#COPY content ./content
WORKDIR /var/www/html
COPY . /src/
COPY . .
RUN chmod +x /usr/local/bin/install-composer && \
/usr/local/bin/install-composer && \
./composer.phar update && \
chmod +x /usr/local/bin/init-server && \
chmod +x /usr/local/bin/adjust-rights
chmod +x /usr/local/bin/init-server
# chmod +x /usr/local/bin/adjust-rights && \
# /usr/local/bin/adjust-rights
WORKDIR /tmp
COPY content ./content
# Create a non-root user to own the files and run our server
WORKDIR /var/www/html
#WORKDIR /var/www/html
# Expose single volume of data to simplify maintenance
VOLUME /var/www/html
#VOLUME /var/www/html/content
#RUN cp -R /src/* /var/www/html/
#RUN cp -R /tmp/* /var/www/html/

View File

@ -1,8 +1,9 @@
#!/bin/sh
chown -R www-data:www-data /var/www/html
find /var/www/html -type d -exec chmod 570 {} \;
find /var/www/html -type f -exec chmod 460 {} \;
#chown -R www-data:www-data /var/www/html
#find /var/www/html -type d -exec chmod 570 {} \;
#find /var/www/html -type f -exec chmod 460 {} \;
echo TestMBO1
chown -R www-data:www-data /var/www/html/cache
find /var/www/html/cache -type d -exec chmod 770 {} \;
find /var/www/html/cache -type f -exec chmod 660 {} \;

View File

@ -1,16 +1,17 @@
#!/bin/sh
find /var/www/html -type d -empty -exec cp -R /tmp/* /var/www/html/ \;
#usermod -u $PUID www-data
#groupmod -g $PGID www-data
#find /var/www/html -type d -empty -exec cp -R /tmp/* /var/www/html/ \;
#
#cp -R /src/* /var/www/html/
#cp -R /tmp/* /var/www/html/
cp -R /src/* /var/www/html/
cp -R /tmp/* /var/www/html/
#/usr/local/bin/install-composer && \
#./composer.phar update
/usr/local/bin/install-composer && \
./composer.phar update
usermod -u $PUID www-data
groupmod -g $PGID www-data
/usr/local/bin/adjust-rights
chown www-data:www-data /var/www/html/
#/usr/local/bin/adjust-rights
apache2-foreground

View File

@ -29,7 +29,7 @@ $settings = Typemill\Settings::loadSettings();
/****************************
* HANDLE DISPLAY ERRORS *
****************************/
$settings['settings']['displayErrorDetails'] = true;
//$settings['settings']['displayErrorDetails'] = true;
if(isset($settings['settings']['displayErrorDetails']) && $settings['settings']['displayErrorDetails'])
{
ini_set('display_errors', 1);