cloudron
/
freshrss-app
mirror of https://git.cloudron.io/cloudron/freshrss-app
1
0
Fork 0
Code Issues Releases Wiki Activity

Apply extensions_path fix 

Part of #2
This commit is contained in:
Girish Ramakrishnan 2018-05-31 09:36:49 -07:00
parent cbc8866253
commit 62182d519b
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile
View File

@ -4,14 +4,13 @@ RUN apt-get update \
&& apt-get -y install php php-curl php-gmp php-intl php-mbstring php-xml php-zip \
libapache2-mod-php mysql-client php-mysql
ENV VERSION 1.10.2
ENV EXTENSIONS_VERSION b63f55d6fdd8e93da846bb741c3fed12d50909be
RUN mkdir -p /app/code
WORKDIR /app/code
RUN wget "https://github.com/FreshRSS/FreshRSS/archive/${VERSION}.tar.gz" -O - | tar -xz --strip-components=1 && \
sed -e "s|define('EXTENSIONS_PATH'.*);|define('EXTENSIONS_PATH', '/app/data/extensions');|" -i /app/code/constants.php
# contains fix for extensions_path (see #2)
RUN curl -L https://github.com/cloudron-io/FreshRSS/archive/2c7c367a5b38870e3250b1359ead3c2665410f89.tar.gz | tar -zxvf - --strip-components=1
RUN mv data data-orig && ln -s /app/data data

9
start.sh
View File

@ -25,13 +25,12 @@ rm -f /app/data/users/_/log_api.txt
touch /tmp/log_api.txt
ln -s /tmp/log_api.txt /app/data/users/_/log_api.txt
echo "Symlinking packaged extensions"
# We have to copy instead of symlinking extensions (see #2)
echo "Copying packaged extensions"
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
rm -rf "/app/data/extensions/$f"
cp -r "/app/code/extensions-orig/$f" "/app/data/extensions"
done