marcel/docker-spotweb
1
0
Fork 0
mirror of https://github.com/jgeusebroek/docker-spotweb.git synced 2025-08-06 05:08:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert to master branch. Media branch is deprecated.

Browse Source
This commit is contained in:
Jeroen Geusebroek
2016-11-16 20:09:30 +01:00
parent a84876c66d
commit 0c86206459
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -19,7 +19,7 @@ RUN echo "force-unsafe-io" > /etc/dpkg/dpkg.cfg.d/02apt-speedup &&\
rm -r /var/www/html && \ rm -r /var/www/html && \
rm -rf /tmp/* rm -rf /tmp/*
RUN git clone -b media --single-branch https://github.com/spotweb/spotweb.git /var/www/spotweb && \ RUN git clone -b master --single-branch https://github.com/spotweb/spotweb.git /var/www/spotweb && \
rm -rf /var/www/spotweb/.git && \ rm -rf /var/www/spotweb/.git && \
chmod -R 775 /var/www/spotweb && \ chmod -R 775 /var/www/spotweb && \
chown -R www-data:www-data /var/www/spotweb chown -R www-data:www-data /var/www/spotweb

4
entrypoint.sh
View File

@@ -24,7 +24,7 @@ if [ -f /config/dbsettings.inc.php ]; then
ln -s /config/dbsettings.inc.php /var/www/spotweb/dbsettings.inc.php ln -s /config/dbsettings.inc.php /var/www/spotweb/dbsettings.inc.php
# Run database update # Run database update
/usr/bin/php /var/www/spotweb/upgrade-db.php /usr/bin/php /var/www/spotweb/bin/upgrade-db.php
else else
echo -e "\nWARNING: You have no database configuration file, either create /config/dbsettings.inc.php or restart this container with the correct environment variables to auto generate the config.\n" echo -e "\nWARNING: You have no database configuration file, either create /config/dbsettings.inc.php or restart this container with the correct environment variables to auto generate the config.\n"
fi fi
@@ -36,4 +36,4 @@ sed -i "s#^;date.timezone =.*#date.timezone = ${TZ}#g" /etc/php5/*/php.ini
# Enabling PHP mod rewrite # Enabling PHP mod rewrite
/usr/sbin/a2enmod rewrite && /etc/init.d/apache2 restart /usr/sbin/a2enmod rewrite && /etc/init.d/apache2 restart
tail -F /var/log/apache2/* tail -F /var/log/apache2/*