Merge pull request #1 from sparklyballs/master

add opt out for autoupdates to git update init
This commit is contained in:
Stian Buch Larsen 2016-01-18 21:54:58 +01:00
commit ef59c6129d
2 changed files with 8 additions and 8 deletions

View File

@ -3,8 +3,8 @@ FROM linuxserver/baseimage.apache
MAINTAINER Sparklyballs <sparklyballs@linuxserver.io>
# Set correct environment variables
ENV APTLIST="git-core php5-gmp php5-intl php5-mysqlnd php5-pgsql"
ENV LANG="en_US.UTF-8" LANGUAGE="en_US:en" LC_ALL="en_US.UTF-8"
ENV APTLIST="git-core php5-gmp php5-intl php5-mysqlnd php5-pgsql" \
LANG="en_US.UTF-8" LANGUAGE="en_US:en" LC_ALL="en_US.UTF-8"
# Set the locale
RUN locale-gen en_US.UTF-8

View File

@ -1,10 +1,10 @@
#!/bin/bash
if [ ! -f "/config/www/freshrss/index.php" ]; then
echo "fetching freshress files"
git clone https://github.com/marienfressinaud/FreshRSS/ /config/www/freshrss
else
echo "checking for updates"
[[ ! -f /config/www/freshrss/index.php ]] && (git clone https://github.com/marienfressinaud/FreshRSS/ /config/www/freshrss && \
chown -R abc:abc /config)
# opt out for autoupdates
[ "$ADVANCED_DISABLEUPDATES" ] && exit 0
cd /config/www/freshrss
git pull
fi
chown -R abc:abc /config