From 5ba3b4909002b8e75870d868acc9d1ea65b4099b Mon Sep 17 00:00:00 2001 From: x86dev Date: Thu, 13 Jul 2017 18:13:45 +0200 Subject: [PATCH] No need to run the setup when build the container; logging. --- Dockerfile | 3 --- root/srv/setup-ttrss.sh | 4 +++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 387f948..53985fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,9 +32,6 @@ ENV DB_NAME ttrss ENV DB_USER ttrss ENV DB_PASS ttrss -# Only run the setup once. -RUN set -xe && /srv/setup-ttrss.sh - # Clean up. RUN set -xe && apk del --progress --purge && rm -rf /var/cache/apk/* diff --git a/root/srv/setup-ttrss.sh b/root/srv/setup-ttrss.sh index d951dbd..434334f 100755 --- a/root/srv/setup-ttrss.sh +++ b/root/srv/setup-ttrss.sh @@ -50,11 +50,13 @@ setup_ttrss() if [ ! -d ${TTRSS_PATH} ]; then mkdir -p ${TTRSS_PATH} if [ -n "$TTRSS_GIT_TAG" ]; then + echo "Setup: Setting up Tiny Tiny RSS '$TTRSS_GIT_TAG' ..." cd ${TTRSS_PATH} git init . - git fetch --depth 1 https://tt-rss.org/gitlab/fox/tt-rss.git refs/tags/${TTRSS_GIT_TAG}:refs/tags/${TTRSS_GIT_TAG} + git fetch --depth=1 https://tt-rss.org/gitlab/fox/tt-rss.git refs/tags/${TTRSS_GIT_TAG}:refs/tags/${TTRSS_GIT_TAG} git checkout tags/${TTRSS_GIT_TAG} else + echo "Setup: Setting up Tiny Tiny RSS (latest revision) ..." git clone --depth=1 https://tt-rss.org/gitlab/fox/tt-rss.git ${TTRSS_PATH} fi git clone --depth=1 https://github.com/sepich/tt-rss-mobilize.git ${TTRSS_PATH}/plugins/mobilize