move container library setup to base image
All checks were successful
continuous-integration/drone/pr Build is passing

This commit is contained in:
Robert Kaussow 2021-10-09 22:25:10 +02:00
parent 5d918aec5f
commit 4234de9d7d
Signed by: xoxys
GPG Key ID: 4E692A2EAECC03C0

View File

@ -8,12 +8,9 @@ LABEL org.opencontainers.image.source="https://gitea.rknet.org/docker/freshrss"
LABEL org.opencontainers.image.documentation="https://gitea.rknet.org/docker/freshrss" LABEL org.opencontainers.image.documentation="https://gitea.rknet.org/docker/freshrss"
ARG BUILD_VERSION ARG BUILD_VERSION
ARG CONTAINER_LIBRARY
# renovate: datasource=github-releases depName=FreshRSS/FreshRSS # renovate: datasource=github-releases depName=FreshRSS/FreshRSS
ENV FRESHRSS_VERSION="${BUILD_VERSION:-1.18.1}" ENV FRESHRSS_VERSION="${BUILD_VERSION:-1.18.1}"
# renovate: datasource=git-tags depName=https://gitea.rknet.org/docker/container-library
ENV CONTAINER_LIBRARY="${CONTAINER_LIBRARY:-v0.1.3}"
ADD overlay/ / ADD overlay/ /
@ -22,8 +19,6 @@ RUN apk --update add --virtual .build-deps tar curl && \
php7-zip php7-ctype php7-dom php7-fileinfo php7-iconv php7-json php7-session \ php7-zip php7-ctype php7-dom php7-fileinfo php7-iconv php7-json php7-session \
php7-simplexml php7-xmlreader php7-zlib php7-pdo_sqlite php7-pdo_mysql\ php7-simplexml php7-xmlreader php7-zlib php7-pdo_sqlite php7-pdo_mysql\
php7-pdo_pgsql && \ php7-pdo_pgsql && \
curl -SsL "https://gitea.rknet.org/docker/container-library/releases/download/${CONTAINER_LIBRARY}/container-library.tar.gz" | \
tar xz -C / && \
rm -rf /var/www/localhost && \ rm -rf /var/www/localhost && \
rm -f /etc/php7/php-fpm.d/www.conf && \ rm -f /etc/php7/php-fpm.d/www.conf && \
mkdir -p /var/www/app && \ mkdir -p /var/www/app && \