hoellen/dockerfiles
1
0
Fork 0
mirror of https://github.com/hoellen/dockerfiles.git synced 2025-04-20 04:19:18 +00:00
Code Issues Projects Releases Wiki Activity

nextcloud: fix timezone

Browse Source
This commit is contained in:
Wonderfall 2016-10-12 13:54:55 +02:00
parent a05104eb94
commit 58a08df8bb
6 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nextcloud/10.0/Dockerfile
View File

@ -10,7 +10,7 @@ ENV UID=991 GID=991 \
APC_SHM_SIZE=128M \ APC_SHM_SIZE=128M \
OPCACHE_MEM_SIZE=128 \ OPCACHE_MEM_SIZE=128 \
CRON_PERIOD=15m \ CRON_PERIOD=15m \
TZ=Europe/Berlin \ TZ=Etc/UTC \
DB_TYPE=sqlite3 \ DB_TYPE=sqlite3 \
ADMIN_USER=admin \ ADMIN_USER=admin \
ADMIN_PASSWORD=admin ADMIN_PASSWORD=admin
@ -33,6 +33,7 @@ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/a
libsmbclient \ libsmbclient \
samba-client \ samba-client \
su-exec \ su-exec \
tzdata \
php7@commuedge \ php7@commuedge \
php7-fpm@commuedge \ php7-fpm@commuedge \
php7-intl@commuedge \ php7-intl@commuedge \

2
nextcloud/10.0/run.sh
View File

@ -5,8 +5,6 @@ sed -i -e "s/<UPLOAD_MAX_SIZE>/$UPLOAD_MAX_SIZE/g" /etc/nginx/nginx.conf /etc/ph
-e "s/<OPCACHE_MEM_SIZE>/$OPCACHE_MEM_SIZE/g" /etc/php7/conf.d/00_opcache.ini \ -e "s/<OPCACHE_MEM_SIZE>/$OPCACHE_MEM_SIZE/g" /etc/php7/conf.d/00_opcache.ini \
-e "s/<CRON_PERIOD>/$CRON_PERIOD/g" /etc/s6.d/cron/run -e "s/<CRON_PERIOD>/$CRON_PERIOD/g" /etc/s6.d/cron/run
echo ${TZ:-UTC} >/etc/timezone
# Put the configuration and apps into volumes # Put the configuration and apps into volumes
ln -sf /config/config.php /nextcloud/config/config.php &>/dev/null ln -sf /config/config.php /nextcloud/config/config.php &>/dev/null
ln -sf /apps2 /nextcloud &>/dev/null ln -sf /apps2 /nextcloud &>/dev/null

3
nextcloud/10.0/setup.sh
View File

@ -80,7 +80,6 @@ echo "Automatic configuration finished."
# * We need to set the logdateformat to something that will work correctly with fail2ban # * We need to set the logdateformat to something that will work correctly with fail2ban
# Use PHP to read the settings file, modify it, and write out the new settings array. # Use PHP to read the settings file, modify it, and write out the new settings array.
TIMEZONE=$(cat /etc/timezone)
CONFIG_TEMP=$(/bin/mktemp) CONFIG_TEMP=$(/bin/mktemp)
php7 <<EOF > $CONFIG_TEMP && mv $CONFIG_TEMP $CONFIGFILE php7 <<EOF > $CONFIG_TEMP && mv $CONFIG_TEMP $CONFIGFILE
<?php <?php
@ -92,7 +91,7 @@ include("/config/config.php");
//\$CONFIG['overwrite.cli.url'] = '/cloud'; //\$CONFIG['overwrite.cli.url'] = '/cloud';
\$CONFIG['mail_from_address'] = 'administrator'; # just the local part, matches our master administrator address \$CONFIG['mail_from_address'] = 'administrator'; # just the local part, matches our master administrator address
\$CONFIG['logtimezone'] = '$TIMEZONE'; \$CONFIG['logtimezone'] = '$TZ';
\$CONFIG['logdateformat'] = 'Y-m-d H:i:s'; \$CONFIG['logdateformat'] = 'Y-m-d H:i:s';
echo "<?php\n\\\$CONFIG = "; echo "<?php\n\\\$CONFIG = ";

3
nextcloud/daily/Dockerfile
View File

@ -8,7 +8,7 @@ ENV UID=991 GID=991 \
APC_SHM_SIZE=128M \ APC_SHM_SIZE=128M \
OPCACHE_MEM_SIZE=128 \ OPCACHE_MEM_SIZE=128 \
CRON_PERIOD=15m \ CRON_PERIOD=15m \
TZ=Europe/Berlin \ TZ=Etc/UTC \
DB_TYPE=sqlite3 \ DB_TYPE=sqlite3 \
ADMIN_USER=admin \ ADMIN_USER=admin \
ADMIN_PASSWORD=admin ADMIN_PASSWORD=admin
@ -30,6 +30,7 @@ RUN echo "@commuedge https://nl.alpinelinux.org/alpine/edge/community" >> /etc/a
libsmbclient \ libsmbclient \
samba-client \ samba-client \
su-exec \ su-exec \
tzdata \
php7@commuedge \ php7@commuedge \
php7-fpm@commuedge \ php7-fpm@commuedge \
php7-intl@commuedge \ php7-intl@commuedge \

2
nextcloud/daily/run.sh
View File

@ -5,8 +5,6 @@ sed -i -e "s/<UPLOAD_MAX_SIZE>/$UPLOAD_MAX_SIZE/g" /etc/nginx/nginx.conf /etc/ph
-e "s/<OPCACHE_MEM_SIZE>/$OPCACHE_MEM_SIZE/g" /etc/php7/conf.d/00_opcache.ini \ -e "s/<OPCACHE_MEM_SIZE>/$OPCACHE_MEM_SIZE/g" /etc/php7/conf.d/00_opcache.ini \
-e "s/<CRON_PERIOD>/$CRON_PERIOD/g" /etc/s6.d/cron/run -e "s/<CRON_PERIOD>/$CRON_PERIOD/g" /etc/s6.d/cron/run
echo ${TZ:-UTC} >/etc/timezone
# Put the configuration and apps into volumes # Put the configuration and apps into volumes
ln -sf /config/config.php /nextcloud/config/config.php &>/dev/null ln -sf /config/config.php /nextcloud/config/config.php &>/dev/null
ln -sf /apps2 /nextcloud &>/dev/null ln -sf /apps2 /nextcloud &>/dev/null

3
nextcloud/daily/setup.sh
View File

@ -80,7 +80,6 @@ echo "Automatic configuration finished."
# * We need to set the logdateformat to something that will work correctly with fail2ban # * We need to set the logdateformat to something that will work correctly with fail2ban
# Use PHP to read the settings file, modify it, and write out the new settings array. # Use PHP to read the settings file, modify it, and write out the new settings array.
TIMEZONE=$(cat /etc/timezone)
CONFIG_TEMP=$(/bin/mktemp) CONFIG_TEMP=$(/bin/mktemp)
php7 <<EOF > $CONFIG_TEMP && mv $CONFIG_TEMP $CONFIGFILE php7 <<EOF > $CONFIG_TEMP && mv $CONFIG_TEMP $CONFIGFILE
<?php <?php
@ -92,7 +91,7 @@ include("/config/config.php");
//\$CONFIG['overwrite.cli.url'] = '/cloud'; //\$CONFIG['overwrite.cli.url'] = '/cloud';
\$CONFIG['mail_from_address'] = 'administrator'; # just the local part, matches our master administrator address \$CONFIG['mail_from_address'] = 'administrator'; # just the local part, matches our master administrator address
\$CONFIG['logtimezone'] = '$TIMEZONE'; \$CONFIG['logtimezone'] = '$TZ';
\$CONFIG['logdateformat'] = 'Y-m-d H:i:s'; \$CONFIG['logdateformat'] = 'Y-m-d H:i:s';
echo "<?php\n\\\$CONFIG = "; echo "<?php\n\\\$CONFIG = ";