cleanup
Some checks reported errors
continuous-integration/drone/push Build was killed

This commit is contained in:
Robert Kaussow 2020-02-22 15:17:45 +01:00
parent e8deab32e5
commit b3e147b557
4 changed files with 20 additions and 19 deletions

View File

@ -1,8 +0,0 @@
.git
.git*
.drone.*
*.md
.dockerignore
Dockerfile
Dockerfile.*
docker-compose.yml

View File

@ -12,11 +12,11 @@ local PipelineBuild(arch='amd64') = {
settings: {
dry_run: true,
dockerfile: 'Dockerfile',
repo: 'xoxys/freshrss',
repo: 'xoxys/${DRONE_REPO_NAME}',
username: { from_secret: 'docker_username' },
password: { from_secret: 'docker_password' },
build_args: [
'FRESHRSS_VERSION=${DRONE_TAG%-*}',
'BUILD_VERSION=${DRONE_TAG%-*}',
],
},
when: {
@ -32,11 +32,11 @@ local PipelineBuild(arch='amd64') = {
auto_tag: true,
auto_tag_suffix: arch,
dockerfile: 'Dockerfile',
repo: 'xoxys/freshrss',
repo: 'xoxys/${DRONE_REPO_NAME}',
username: { from_secret: 'docker_username' },
password: { from_secret: 'docker_password' },
build_args: [
'FRESHRSS_VERSION=${DRONE_TAG%-*}',
'BUILD_VERSION=${DRONE_TAG%-*}',
],
},
when: {
@ -99,7 +99,7 @@ local PipelineNotifications(depends_on=[]) = {
DOCKERHUB_USERNAME: { from_secret: 'docker_username' },
DOCKERHUB_PASSWORD: { from_secret: 'docker_password' },
DOCKERHUB_REPO_PREFIX: 'xoxys',
DOCKERHUB_REPO_NAME: 'freshrss',
DOCKERHUB_REPO_NAME: '${DRONE_REPO_NAME}',
README_PATH: 'README.md',
SHORT_DESCRIPTION: 'Rootless FreshRSS - Self-hosted RSS feed aggregator',
},

View File

@ -6,7 +6,10 @@ LABEL maintainer="Robert Kaussow <mail@geeklabor.de>" \
org.label-schema.vendor="Robert Kaussow" \
org.label-schema.schema-version="1.0"
ARG FRESHRSS_VERSION=master
ARG BUILD_VERSION=master
ENV FRESHRSS_VERSION="${BUILD_VERSION:-master}"
ADD overlay/ /
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 \
@ -17,14 +20,13 @@ 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 && \
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 https://github.com/FreshRSS/FreshRSS/archive/${FRESHRSS_VERSION##v}.tar.gz | \
tar xz -C /var/www/app/ -X /.tarignore --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/* && \
rm -rf /tmp/* && \
rm -rf /var/www/app/CHANGELOG.md /var/www/app/CONTRIBUTING.md /var/www/app/CREDITS.md /var/www/app/Docker /var/www/app/README.* && \
mkdir -p /var/run/php && \
chown -R nginx /var/run/php && \
mkdir -p /var/lib/php/tmp_upload && \
@ -35,8 +37,6 @@ RUN apk --update add --virtual .build-deps tar curl && \
chown -R nginx:nginx /var/www/.postgresql && \
chown -R nginx:nginx /var/www/app
ADD overlay/ /
VOLUME /var/www/app/extensions
VOLUME /var/www/app/data

9
overlay/.tarignore Normal file
View File

@ -0,0 +1,9 @@
CHANGELOG.md
CONTRIBUTING.md
CREDITS.md
Docker
docs
tests
README*
Make*
.[!.]*