New base image, extensions

This commit is contained in:
Dennis Schwerdel 2017-02-18 11:51:44 +01:00
parent 0dfbe30164
commit bbddef8d92
2 changed files with 15 additions and 1 deletions

View File

@ -1,4 +1,4 @@
FROM cloudron/base:0.9.0
FROM cloudron/base:0.10.0
MAINTAINER Rainloop Developers <support@cloudron.io>
EXPOSE 8000
@ -8,6 +8,7 @@ RUN apt-get update \
libapache2-mod-php mysql-client php-mysql
ENV VERSION 1.6.2
ENV EXTENSIONS_VERSION eac4b749775c3e1b584c1a6b4a4487e4a4b8b159
RUN mkdir -p /app/code
WORKDIR /app/code
@ -19,6 +20,12 @@ RUN mkdir -p /app/data \
&& mv data data-orig \
&& ln -s /app/data data
RUN mkdir /app/code/extensions-orig \
&& wget https://github.com/FreshRSS/Extensions/archive/${EXTENSIONS_VERSION}.tar.gz -O - \
| tar -xz --strip-components=1 -C /app/code/extensions-orig \
&& rm -rf /app/code/extensions \
&& ln -s /app/data/extensions /app/code/extensions
ADD apache2.conf /etc/apache2/sites-available/freshrss.conf
RUN rm /etc/apache2/sites-enabled/* \

View File

@ -25,6 +25,13 @@ EOF
echo "Done."
fi
mkdir -p /app/data/extensions
for f in $(ls /app/code/extensions-orig); do
if ! [ -e "/app/data/extensions/$f" ]; then
ln -s "/app/code/extensions-orig/$f" "/app/data/extensions/$f"
fi
done
echo "Creating config file"
SALT=$(cat /app/data/.salt)
cat > /app/data/config.php <<EOF