diff --git a/Dockerfile b/Dockerfile index 25490cc..02c77b2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,6 @@ LABEL maintainer="Robert Kaussow " \ org.label-schema.schema-version="1.0" ARG FRESHRSS_VERSION=master -ARG FRESHRSS_TARBALL=https://github.com/FreshRSS/FreshRSS/archive/${FRESHRSS_VERSION:-master}.tar.gz RUN apk --update add --virtual .build-deps tar curl && \ apk --update add php7 php7-curl php7-fpm php7-gmp php7-intl php7-mbstring php7-xml \ @@ -18,8 +17,9 @@ RUN apk --update add --virtual .build-deps tar curl && \ rm -f /etc/php7/php-fpm.d/www.conf && \ mkdir -p /var/www/app && \ mkdir /var/www/.postgresql && \ - echo "Installing FreshRSS '${FRESHRSS_VERSION:-master}' ..." && \ - curl -SsL ${FRESHRSS_TARBALL} | tar xz -C /var/www/app/ --strip-components=1 && \ + FRESHRSS_VERSION="${FRESHRSS_VERSION:-master}" && \ + echo "Installing FreshRSS '${FRESHRSS_VERSION}' ..." && \ + curl -SsL https://github.com/FreshRSS/FreshRSS/archive/${FRESHRSS_VERSION##v}.tar.gz | tar xz -C /var/www/app/ --strip-components=1 && \ curl -SsL -o /etc/php7/browscap.ini https://browscap.org/stream?q=Lite_PHP_BrowsCapINI && \ apk del .build-deps && \ rm -rf /var/cache/apk/* && \