No need to run the setup when build the container; logging.

This commit is contained in:
x86dev 2017-07-13 18:13:45 +02:00
parent 3cbb67e680
commit 5ba3b49090
2 changed files with 3 additions and 4 deletions

View File

@ -32,9 +32,6 @@ ENV DB_NAME ttrss
ENV DB_USER ttrss ENV DB_USER ttrss
ENV DB_PASS ttrss ENV DB_PASS ttrss
# Only run the setup once.
RUN set -xe && /srv/setup-ttrss.sh
# Clean up. # Clean up.
RUN set -xe && apk del --progress --purge && rm -rf /var/cache/apk/* RUN set -xe && apk del --progress --purge && rm -rf /var/cache/apk/*

View File

@ -50,11 +50,13 @@ setup_ttrss()
if [ ! -d ${TTRSS_PATH} ]; then if [ ! -d ${TTRSS_PATH} ]; then
mkdir -p ${TTRSS_PATH} mkdir -p ${TTRSS_PATH}
if [ -n "$TTRSS_GIT_TAG" ]; then if [ -n "$TTRSS_GIT_TAG" ]; then
echo "Setup: Setting up Tiny Tiny RSS '$TTRSS_GIT_TAG' ..."
cd ${TTRSS_PATH} cd ${TTRSS_PATH}
git init . 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} git checkout tags/${TTRSS_GIT_TAG}
else 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} git clone --depth=1 https://tt-rss.org/gitlab/fox/tt-rss.git ${TTRSS_PATH}
fi fi
git clone --depth=1 https://github.com/sepich/tt-rss-mobilize.git ${TTRSS_PATH}/plugins/mobilize git clone --depth=1 https://github.com/sepich/tt-rss-mobilize.git ${TTRSS_PATH}/plugins/mobilize