Fix cron CMD

Alkarex · Alkarex · commit ecf366da7706 · 2018-04-25T22:36:50.000+02:00
diff --git a/Docker/Dockerfile b/Docker/Dockerfile
@@ -18,13 +18,9 @@ COPY ./Docker/*.Apache.conf /etc/apache2/conf.d/
 RUN echo "17,37 * * * * php ${FRESHRSS_ROOT}/app/actualize_script.php 2>&1 | tee /tmp/FreshRSS.log" >> \
 	/var/spool/cron/crontabs/root
 
-EXPOSE 80
 ENV CRON_MIN ''
-CMD php -f ./cli/prepare.php > /dev/null && \
-	chown -R :www-data ${FRESHRSS_ROOT} && \
-	chmod -R g+r ${FRESHRSS_ROOT} && chmod -R g+w ${FRESHRSS_ROOT}/data/ && \
-	([ -z "$CRON_MIN" ] || ( \
-		sed -r -i "/FreshRSS/s/^[^ ]+ /$CRON_MIN /g" /var/spool/cron/crontabs/root && \
-		crond -d 6 \
-	)) && \
+ENTRYPOINT ["./Docker/entrypoint.sh"]
+
+EXPOSE 80
+CMD ([ -z "$CRON_MIN" ] || crond -d 6) && \
 	exec httpd -D FOREGROUND
diff --git a/Docker/README.md b/Docker/README.md
@@ -130,7 +130,6 @@ See cron option 1 for customising the cron schedule.
 sudo docker run -dit --restart unless-stopped --log-opt max-size=10m \
 	-v $(pwd)/data:/var/www/FreshRSS/data \
 	-e 'CRON_MIN=17,37' \
-	-p 8080:80 \
 	--name freshrss_cron freshrss/freshrss crond -f -d 6
 ```
 
diff --git a/Docker/entrypoint.sh b/Docker/entrypoint.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+php -f ./cli/prepare.php > /dev/null
+
+chown -R :www-data .
+chmod -R g+r . && chmod -R g+w ./data/
+
+if [ -n "$CRON_MIN" ]; then
+	sed -r -i "/FreshRSS/s/^[^ ]+ /$CRON_MIN /g" /var/spool/cron/crontabs/root
+fi
+
+exec "$@"
