Revert to master branch. Media branch is deprecated.

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

View File

@ -19,7 +19,7 @@ RUN echo "force-unsafe-io" > /etc/dpkg/dpkg.cfg.d/02apt-speedup &&\
rm -r /var/www/html && \
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 && \
chmod -R 775 /var/www/spotweb && \
chown -R www-data:www-data /var/www/spotweb

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
# Run database update
/usr/bin/php /var/www/spotweb/upgrade-db.php
/usr/bin/php /var/www/spotweb/bin/upgrade-db.php
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"
fi