.chglog/CHANGELOG.tpl.md

@@ -1,23 +0,0 @@
-# Changelog
-
-{{ range .Versions -}}
-## {{ if .Tag.Previous }}[{{ .Tag.Name }}]({{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }}){{ else }}{{ .Tag.Name }}{{ end }} ({{ datetime "2006-01-02" .Tag.Date }})
-
-{{ range .CommitGroups -}}
-### {{ .Title }}
-
-{{ range .Commits -}}
-- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ (regexReplaceAll "(.*)/issues/(.*)" (regexReplaceAll "(Co-\\w*-by.*)" .Subject "") "${1}/pulls/${2}") | trim }}
-{{ end }}
-{{- end -}}
-
-{{- if .NoteGroups -}}
-{{ range .NoteGroups -}}
-### {{ .Title }}
-
-{{ range .Notes }}
-{{ .Body }}
-{{ end }}
-{{ end -}}
-{{ end -}}
-{{ end -}}

.chglog/config.yml

@@ -1,25 +0,0 @@
-style: github
-template: CHANGELOG.tpl.md
-info:
-  title: CHANGELOG
-  repository_url: https://gitea.rknet.org/docker/freshrss
-options:
-  commit_groups:
-    title_maps:
-      feat: Features
-      fix: Bug Fixes
-      perf: Performance Improvements
-      refactor: Code Refactoring
-      chore: Others
-      test: Testing
-      ci: CI Pipeline
-      docs: Documentation
-  header:
-    pattern: "^(\\w*)(?:\\(([\\w\\$\\.\\-\\*\\s]*)\\))?\\:\\s(.*)$"
-    pattern_maps:
-      - Type
-      - Scope
-      - Subject
-  notes:
-    keywords:
-      - BREAKING CHANGE

.drone.jsonnet

@@ -0,0 +1,148 @@
+local PipelineBuild(arch='amd64') = {
+  kind: 'pipeline',
+  name: 'build-' + arch,
+  platform: {
+    os: 'linux',
+    arch: arch,
+  },
+  steps: [
+    {
+      name: 'dryrun',
+      image: 'plugins/docker',
+      settings: {
+        dry_run: true,
+        dockerfile: 'Dockerfile',
+        repo: 'xoxys/${DRONE_REPO_NAME}',
+        username: { from_secret: 'docker_username' },
+        password: { from_secret: 'docker_password' },
+        build_args: [
+          'BUILD_VERSION=${DRONE_TAG%-*}',
+        ],
+      },
+      when: {
+        ref: [
+          'refs/pull/**',
+        ],
+      },
+    },
+    {
+      name: 'publish',
+      image: 'plugins/docker',
+      settings: {
+        auto_tag: true,
+        auto_tag_suffix: arch,
+        dockerfile: 'Dockerfile',
+        repo: 'xoxys/${DRONE_REPO_NAME}',
+        username: { from_secret: 'docker_username' },
+        password: { from_secret: 'docker_password' },
+        build_args: [
+          'BUILD_VERSION=${DRONE_TAG%-*}',
+        ],
+      },
+      when: {
+        ref: [
+          'refs/heads/master',
+          'refs/tags/**',
+        ],
+      },
+    },
+    {
+      name: 'publish-gitea',
+      image: 'plugins/gitea-release',
+      settings: {
+        api_key: { from_secret: 'gitea_token' },
+        base_url: 'https://gitea.rknet.org',
+        overwrite: true,
+        title: '${DRONE_TAG}',
+        note: 'CHANGELOG.md',
+      },
+      when: {
+        ref: ['refs/tags/**'],
+      },
+    },
+  ],
+};
+
+local PipelineNotifications(depends_on=[]) = {
+  kind: 'pipeline',
+  name: 'notifications',
+  platform: {
+    os: 'linux',
+    arch: 'amd64',
+  },
+  steps: [
+    {
+      image: 'plugins/manifest',
+      name: 'manifest',
+      settings: {
+        ignore_missing: true,
+        tags: [
+          '${DRONE_TAG}',
+          '${DRONE_TAG%-*}',
+          '${DRONE_TAG%.*}',
+          '${DRONE_TAG%%.*}',
+        ],
+        username: { from_secret: 'docker_username' },
+        password: { from_secret: 'docker_password' },
+        spec: 'manifest.tmpl',
+      },
+      when: {
+        status: [
+          'success',
+        ],
+      },
+    },
+    {
+      name: 'readme',
+      image: 'sheogorath/readme-to-dockerhub',
+      environment: {
+        DOCKERHUB_USERNAME: { from_secret: 'docker_username' },
+        DOCKERHUB_PASSWORD: { from_secret: 'docker_password' },
+        DOCKERHUB_REPO_PREFIX: 'xoxys',
+        DOCKERHUB_REPO_NAME: '${DRONE_REPO_NAME}',
+        README_PATH: 'README.md',
+        SHORT_DESCRIPTION: 'Rootless FreshRSS - Self-hosted RSS feed aggregator',
+      },
+      when: {
+        status: [
+          'success',
+        ],
+      },
+    },
+    {
+      name: 'matrix',
+      image: 'plugins/matrix',
+      settings: {
+        homeserver: { from_secret: 'matrix_homeserver' },
+        roomid: { from_secret: 'matrix_roomid' },
+        template: 'Status: **{{ build.status }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.link }}) ({{ build.branch }}) by {{ build.author }}<br/> Message: {{ build.message }}',
+        username: { from_secret: 'matrix_username' },
+        password: { from_secret: 'matrix_password' },
+      },
+      when: {
+        status: [
+          'success',
+          'failure',
+        ],
+      },
+    },
+  ],
+  trigger: {
+    ref: [
+      'refs/heads/master',
+      'refs/tags/**',
+    ],
+    status: [
+      'success',
+      'failure',
+    ],
+  },
+  depends_on: depends_on,
+};
+
+[
+  PipelineBuild(arch='amd64'),
+  PipelineNotifications(depends_on=[
+    'build-amd64',
+  ]),
+]

.drone.yml

@@ -1,133 +1,59 @@
 ---
 kind: pipeline
-name: test
+name: build-amd64
 
 platform:
   os: linux
   arch: amd64
 
 steps:
-  - name: markdownlint
+- name: dryrun
-    image: thegeeklab/markdownlint-cli
+  image: plugins/docker
-    commands:
+  settings:
-      - markdownlint 'README.md'
+    build_args:
-
+    - BUILD_VERSION=${DRONE_TAG%-*}
-trigger:
+    dockerfile: Dockerfile
-  ref:
+    dry_run: true
-    - refs/heads/main
+    password:
+      from_secret: docker_password
+    repo: xoxys/${DRONE_REPO_NAME}
+    username:
+      from_secret: docker_username
+  when:
+    ref:
     - refs/pull/**
+
+- name: publish
+  image: plugins/docker
+  settings:
+    auto_tag: true
+    auto_tag_suffix: amd64
+    build_args:
+    - BUILD_VERSION=${DRONE_TAG%-*}
+    dockerfile: Dockerfile
+    password:
+      from_secret: docker_password
+    repo: xoxys/${DRONE_REPO_NAME}
+    username:
+      from_secret: docker_username
+  when:
+    ref:
+    - refs/heads/master
     - refs/tags/**
 
----
+- name: publish-gitea
-kind: pipeline
+  image: plugins/gitea-release
-name: build-container
+  settings:
-
+    api_key:
-platform:
+      from_secret: gitea_token
-  os: linux
+    base_url: https://gitea.rknet.org
-  arch: amd64
+    note: CHANGELOG.md
-
+    overwrite: true
-steps:
+    title: ${DRONE_TAG}
-  - name: dryrun
+  when:
-    image: thegeeklab/drone-docker-buildx:23
+    ref:
-    settings:
-      dockerfile: Dockerfile
-      dry_run: true
-      provenance: false
-      repo: thegeeklab/${DRONE_REPO_NAME}
-    when:
-      ref:
-        - refs/pull/**
-
-  - name: tags
-    image: thegeeklab/docker-autotag
-    environment:
-      DOCKER_AUTOTAG_FORCE_LATEST: True
-      DOCKER_AUTOTAG_IGNORE_PRERELEASE: True
-      DOCKER_AUTOTAG_OUTPUT_FILE: .tags
-      DOCKER_AUTOTAG_VERSION: ${DRONE_TAG}
-    when:
-      ref:
-        - refs/heads/main
-        - refs/tags/**
-    depends_on:
-      - dryrun
-
-  - name: changelog-generate
-    image: thegeeklab/git-chglog
-    commands:
-      - git fetch -tq
-      - git-chglog --no-color --no-emoji -o CHANGELOG.md ${DRONE_TAG:---next-tag unreleased unreleased}
-    depends_on:
-      - tags
-
-  - name: changelog-format
-    image: thegeeklab/alpine-tools
-    commands:
-      - prettier CHANGELOG.md
-      - prettier -w CHANGELOG.md
-    depends_on:
-      - changelog-generate
-
-  - name: publish-dockerhub
-    image: thegeeklab/drone-docker-buildx:23
-    settings:
-      dockerfile: Dockerfile
-      password:
-        from_secret: docker_password
-      provenance: false
-      repo: thegeeklab/${DRONE_REPO_NAME}
-      username:
-        from_secret: docker_username
-    when:
-      ref:
-        - refs/heads/main
-        - refs/tags/**
-    depends_on:
-      - changelog-format
-
-  - name: publish-quay
-    image: thegeeklab/drone-docker-buildx:23
-    settings:
-      dockerfile: Dockerfile
-      password:
-        from_secret: quay_password
-      provenance: false
-      registry: quay.io
-      repo: quay.io/thegeeklab/${DRONE_REPO_NAME}
-      username:
-        from_secret: quay_username
-    when:
-      ref:
-        - refs/heads/main
-        - refs/tags/**
-    depends_on:
-      - changelog-format
-
-  - name: publish-gitea
-    image: plugins/gitea-release
-    settings:
-      api_key:
-        from_secret: gitea_token
-      base_url: https://gitea.rknet.org
-      note: CHANGELOG.md
-      overwrite: true
-      title: ${DRONE_TAG}
-    when:
-      ref:
-        - refs/tags/**
-    depends_on:
-      - publish-dockerhub
-      - publish-quay
-
-trigger:
-  ref:
-    - refs/heads/main
-    - refs/pull/**
     - refs/tags/**
 
-depends_on:
-  - test
-
 ---
 kind: pipeline
 name: notifications
@@ -137,63 +63,69 @@ platform:
   arch: amd64
 
 steps:
-  - name: pushrm-dockerhub
+- name: manifest
-    pull: always
+  image: plugins/manifest
-    image: chko/docker-pushrm:1
+  settings:
-    environment:
+    ignore_missing: true
-      DOCKER_PASS:
+    password:
-        from_secret: docker_password
+      from_secret: docker_password
-      DOCKER_USER:
+    spec: manifest.tmpl
-        from_secret: docker_username
+    tags:
-      PUSHRM_FILE: README.md
+    - ${DRONE_TAG}
-      PUSHRM_SHORT: Custom image for FreshRSS feed aggregator
+    - ${DRONE_TAG%-*}
-      PUSHRM_TARGET: thegeeklab/${DRONE_REPO_NAME}
+    - ${DRONE_TAG%.*}
-    when:
+    - ${DRONE_TAG%%.*}
-      status:
+    username:
-        - success
+      from_secret: docker_username
+  when:
+    status:
+    - success
 
-  - name: pushrm-quay
+- name: readme
-    pull: always
+  image: sheogorath/readme-to-dockerhub
-    image: chko/docker-pushrm:1
+  environment:
-    environment:
+    DOCKERHUB_PASSWORD:
-      APIKEY__QUAY_IO:
+      from_secret: docker_password
-        from_secret: quay_token
+    DOCKERHUB_REPO_NAME: ${DRONE_REPO_NAME}
-      PUSHRM_FILE: README.md
+    DOCKERHUB_REPO_PREFIX: xoxys
-      PUSHRM_TARGET: quay.io/thegeeklab/${DRONE_REPO_NAME}
+    DOCKERHUB_USERNAME:
-    when:
+      from_secret: docker_username
-      status:
+    README_PATH: README.md
-        - success
+    SHORT_DESCRIPTION: Rootless FreshRSS - Self-hosted RSS feed aggregator
+  when:
+    status:
+    - success
 
-  - name: matrix
+- name: matrix
-    image: thegeeklab/drone-matrix
+  image: plugins/matrix
-    settings:
+  settings:
-      homeserver:
+    homeserver:
-        from_secret: matrix_homeserver
+      from_secret: matrix_homeserver
-      password:
+    password:
-        from_secret: matrix_password
+      from_secret: matrix_password
-      roomid:
+    roomid:
-        from_secret: matrix_roomid
+      from_secret: matrix_roomid
-      template: "Status: **{{ .Build.Status }}**<br/> Build: [{{ .Repo.Owner }}/{{ .Repo.Name }}]({{ .Build.Link }}){{ if .Build.Branch }} ({{ .Build.Branch }}){{ end }} by {{ .Commit.Author }}<br/> Message: {{ .Commit.Message.Title }}"
+    template: "Status: **{{ build.status }}**<br/> Build: [{{ repo.Owner }}/{{ repo.Name }}]({{ build.link }}) ({{ build.branch }}) by {{ build.author }}<br/> Message: {{ build.message }}"
-      username:
+    username:
-        from_secret: matrix_username
+      from_secret: matrix_username
-    when:
+  when:
-      status:
+    status:
-        - success
-        - failure
-
-trigger:
-  ref:
-    - refs/heads/main
-    - refs/tags/**
-  status:
     - success
     - failure
 
+trigger:
+  ref:
+  - refs/heads/master
+  - refs/tags/**
+  status:
+  - success
+  - failure
+
 depends_on:
-  - build-container
+- build-amd64
 
 ---
 kind: signature
-hmac: cba07850e21c648f8558e69aa7e5a561ef473fe2a3a7890bf308a57c73ea0343
+hmac: ef7295f9a2cf94dc557898ef6fb2f9d02dc4fe2aca57da40a0dbe08168c2b0ee
 
 ...

.gitignore

@@ -1,2 +1 @@
 test/
-CHANGELOG.md

.markdownlint.yml

@@ -1,6 +0,0 @@
----
-default: True
-MD013: False
-MD041: False
-MD004:
-  style: dash

.prettierignore

@@ -1,3 +0,0 @@
-.drone.yml
-*.tpl.md
-LICENSE

CHANGELOG.md

@@ -0,0 +1,3 @@
+* ENHANCEMENT
+  * base nginx image updated to alpine 3.11
+  * update to upstream version 1.16.0

Dockerfile

@@ -1,33 +1,30 @@
-FROM thegeeklab/nginx:latest@sha256:72ffd57b6b89013f6b4c6a8a97728120df1dfac0d66b2164e0aacba21ee87380
+FROM xoxys/nginx:latest
 
-LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
+LABEL maintainer="Robert Kaussow <mail@geeklabor.de>" \
-LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"
+    org.label-schema.name="FreshRSS" \
-LABEL org.opencontainers.image.title="FreshRSS"
+    org.label-schema.vcs-url="https://gitea.rknet.org/docker/freshrss" \
-LABEL org.opencontainers.image.url="https://gitea.rknet.org/docker/freshrss"
+    org.label-schema.vendor="Robert Kaussow" \
-LABEL org.opencontainers.image.source="https://gitea.rknet.org/docker/freshrss"
+    org.label-schema.schema-version="1.0"
-LABEL org.opencontainers.image.documentation="https://gitea.rknet.org/docker/freshrss"
 
-ARG BUILD_VERSION
+ARG BUILD_VERSION=master
-
+ENV FRESHRSS_VERSION="${BUILD_VERSION:-master}"
-# renovate: datasource=github-releases depName=FreshRSS/FreshRSS
-ENV FRESHRSS_VERSION="${BUILD_VERSION:-1.21.0}"
 
 ADD overlay/ /
 
 RUN apk --update add --virtual .build-deps tar curl && \
-    apk --update add php81 php81-curl php81-fpm php81-gmp php81-intl php81-mbstring php81-xml \
+    apk --update add php7 php7-curl php7-fpm php7-gmp php7-intl php7-mbstring php7-xml \
-      php81-zip php81-ctype php81-dom php81-fileinfo php81-iconv php81-json php81-opcache php81-phar \
+    php7-zip php7-ctype php7-dom php7-fileinfo php7-iconv php7-json php7-session \
-      php81-session php81-simplexml php81-xmlreader php81-xmlwriter php81-tokenizer php81-zlib \
+    php7-simplexml php7-xmlreader php7-zlib php7-pdo_sqlite php7-pdo_mysql\
-      php81-openssl php81-pdo_sqlite php81-pdo_mysql php81-pdo_pgsql && \
+    php7-pdo_pgsql && \
     rm -rf /var/www/localhost && \
-    rm -f /etc/php81/php-fpm.d/www.conf && \
+    rm -f /etc/php7/php-fpm.d/www.conf && \
     mkdir -p /var/www/app && \
     mkdir /var/www/.postgresql && \
     FRESHRSS_VERSION="${FRESHRSS_VERSION##v}" && \
     echo "Installing FreshRSS version '${FRESHRSS_VERSION}' ..." && \
-    curl -SsfL "https://github.com/FreshRSS/FreshRSS/archive/${FRESHRSS_VERSION}.tar.gz" | \
+    curl -SsL "https://github.com/FreshRSS/FreshRSS/archive/${FRESHRSS_VERSION}.tar.gz" | \
       tar xz -C /var/www/app/ -X /.tarignore --strip-components=1 && \
-    curl -SsfL -o /etc/php81/browscap.ini https://browscap.org/stream?q=Lite_PHP_BrowsCapINI && \
+    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/* && \
@@ -37,7 +34,7 @@ RUN apk --update add --virtual .build-deps tar curl && \
     mkdir -p /var/lib/php/soap_cache && \
     mkdir -p /var/lib/php/session && \
     chown -R nginx /var/lib/php && \
-    chown nginx /etc/php81/php.ini && \
+    chown nginx /etc/php7/php.ini && \
     chown -R nginx:nginx /var/www/.postgresql && \
     chown -R nginx:nginx /var/www/app
 
@@ -51,5 +48,6 @@ USER nginx
 STOPSIGNAL SIGTERM
 
 ENTRYPOINT ["/usr/local/bin/entrypoint"]
+HEALTHCHECK --interval=30s --timeout=5s --retries=3 CMD /usr/local/bin/healthcheck
 WORKDIR /var/www/app
 CMD []

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Robert Kaussow <mail@thegeeklab.de>
+Copyright (c) 2020 Robert Kaussow <mail@geeklabor.de>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,14 +1,10 @@
-# freshrss
+# [freshrss](https://gitea.rknet.org/docker/freshrss)
-
-Custom image for FreshRSS feed aggregator
 
 [![Build Status](https://img.shields.io/drone/build/docker/freshrss?logo=drone&server=https%3A%2F%2Fdrone.rknet.org)](https://drone.rknet.org/docker/freshrss)
-[![Docker Hub](https://img.shields.io/badge/dockerhub-latest-blue.svg?logo=docker&logoColor=white)](https://hub.docker.com/r/thegeeklab/freshrss)
+[![Docker Hub](https://img.shields.io/badge/docker-latest-blue.svg?logo=docker&logoColor=white)](https://hub.docker.com/r/xoxys/freshrss)
-[![Quay.io](https://img.shields.io/badge/quay-latest-blue.svg?logo=docker&logoColor=white)](https://quay.io/repository/thegeeklab/freshrss)
+[![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitea.rknet.org/docker/freshrss/src/branch/master/LICENSE)
-[![Source: Gitea](https://img.shields.io/badge/source-gitea-blue.svg?logo=gitea&logoColor=white)](https://gitea.rknet.org/docker/freshrss)
-[![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitea.rknet.org/docker/freshrss/src/branch/main/LICENSE)
 
-Custom rootless Docker image for FreshRSS, a self-hosted RSS feed aggregator. It is lightweight, easy to work with, powerful, and customizable.
+FreshRSS is a self-hosted RSS feed aggregator. It is lightweight, easy to work with, powerful, and customizable.
 
 ## Usage
 
@@ -22,16 +18,42 @@ Here are some example snippets to help you get started creating a container. Thi
 docker create \
   --name=freshrss \
   -p 80:8080 \
-  thegeeklab/freshrss
+  xoxys/freshrss
 ```
 
 ### Docker Compose
 
-Please take a look at the [example](https://gitea.rknet.org/docker/freshrss/src/branch/main/docker-compose.yml) compose file from the git repo.
+Compatible with docker-compose v2 schemas.
+
+```Yaml
+---
+version: '2.1'
+
+services:
+  freshrss:
+    container_name: freshrss
+    image: xoxys/freshrss:latest
+    ports:
+      - "80:8080"
+    volumes:
+      - freshrss_data:/var/www/app/data
+      - freshrss_extensions:/var/www/app/extensions
+    environment:
+      FRESHRSS_DEFAULT_USER: admin
+      FRESHRSS_DEFAULT_PASSWORD: freshrss
+      FRESHRSS_API_ENABLED: "true"
+      FRESHRSS_SALT: "38fd29ac5878c270bbfc3599723cd479d48c6c58"
+
+volumes:
+  freshrss_data:
+    driver: local
+  freshrss_extensions:
+    driver: local
+```
 
 ## Environment variables
 
-### FreshRSS
+### freshrss
 
 > **WARNING**: Don't change any system settings through the web UI! These changes will be overwritten at EVERY container startup. Use the provided environment variables instead.
 
@@ -48,6 +70,7 @@ FRESHRSS_BASE_URL="http://localhost/"
 FRESHRSS_LANGUAGE="en"
 FRESHRSS_TITLE="FreshRSS"
 FRESHRSS_META_DESCRIPTION=
+FRESHRSS_DEFAULT_USER="_"
 FRESHRSS_ALLOW_ANONYMOUS="false"
 FRESHRSS_ALLOW_ANONYMOUS_REFRESH="false"
 FRESHRSS_AUTH_TYPE="form"
@@ -79,8 +102,6 @@ FRESHRSS_DB_BASE=
 FRESHRSS_DB_PREFIX="freshrss_"
 ## comma-seperated string, extensions must be installed!
 FRESHRSS_EXTENSIONS_ENABLED="Tumblr-GDPR"
-## comma-seperated string
-FRESHRSS_TRUSTED_SOURCES=127.0.0.0/8,::1/128
 ```
 
 ### PHP
@@ -112,4 +133,8 @@ PHP_SQL_SAFE_MODE=On
 
 ## License
 
-This project is licensed under the MIT License - see the [LICENSE](https://gitea.rknet.org/docker/freshrss/src/branch/main/LICENSE) file for details.
+This project is licensed under the MIT License - see the [LICENSE](https://gitea.rknet.org/docker/freshrss/src/branch/master/LICENSE) file for details.
+
+## Maintainers and Contributors
+
+[Robert Kaussow](https://gitea.rknet.org/xoxys)

docker-compose.yml

@@ -1,10 +1,10 @@
 ---
-version: "3"
+version: '2.1'
 
 services:
   freshrss:
     container_name: freshrss
-    image: thegeeklab/freshrss
+    image: xoxys/freshrss:latest
     ports:
       - "80:8080"
     volumes:

manifest.tmpl

@@ -0,0 +1,15 @@
+image: xoxys/freshrss:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}}
+{{#if build.tags}}
+tags:
+{{#each build.tags}}
+  {{#if this}}
+  - {{trimPrefix "v" this}}
+  - {{trimPrefix "v" this}}-amd64
+  {{/if}}
+{{/each}}
+{{/if}}
+manifests:
+  - image: xoxys/freshrss:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}amd64
+    platform:
+      architecture: amd64
+      os: linux

overlay/etc/templates/config.php.tmpl

@@ -7,16 +7,16 @@ return array(
     'language' => '{{ getenv "FRESHRSS_LANGUAGE" "en" }}',
     'title' => '{{ getenv "FRESHRSS_TITLE" "FreshRSS" }}',
     'meta_description' => '{{ getenv "FRESHRSS_META_DESCRIPTION" }}',
-    'default_user' => '{{ getenv "FRESHRSS_DEFAULT_USER" "admin" }}',
+    'default_user' => '{{ getenv "FRESHRSS_DEFAULT_USER" "_" }}',
-    'allow_anonymous' => {{ getenv "FRESHRSS_ALLOW_ANONYMOUS" "false" | conv.ToBool }},
+    'allow_anonymous' => {{ getenv "FRESHRSS_ALLOW_ANONYMOUS" "false" }},
-    'allow_anonymous_refresh' => {{ getenv "FRESHRSS_ALLOW_ANONYMOUS_REFRESH" "false" | conv.ToBool }},
+    'allow_anonymous_refresh' => {{ getenv "FRESHRSS_ALLOW_ANONYMOUS_REFRESH" "false" }},
     'auth_type' => '{{ getenv "FRESHRSS_AUTH_TYPE" "form" }}',
-    'api_enabled' => {{ getenv "FRESHRSS_API_ENABLED" "false" | conv.ToBool }},
+    'api_enabled' => {{ getenv "FRESHRSS_API_ENABLED" "false" }},
-    'unsafe_autologin_enabled' => {{ getenv "FRESHRSS_UNSAFE_AUTOLOGIN_ENABLED" "false" | conv.ToBool }},
+    'unsafe_autologin_enabled' => {{ getenv "FRESHRSS_UNSAFE_AUTOLOGIN_ENABLED" "false" }},
-    'simplepie_syslog_enabled' => {{ getenv "FRESHRSS_SIMPLEPIE_SYSLOG_ENABLED" "true" | conv.ToBool }},
+    'simplepie_syslog_enabled' => {{ getenv "FRESHRSS_SIMPLEPIE_SYSLOG_ENABLED" "true" }},
-    'pubsubhubbub_enabled' => {{ getenv "FRESHRSS_PUBSUBHUBBUB_ENABLED" "false" | conv.ToBool }},
+    'pubsubhubbub_enabled' => {{ getenv "FRESHRSS_PUBSUBHUBBUB_ENABLED" "false" }},
-    'allow_robots' => {{ getenv "FRESHRSS_ALLOW_ROBOTS" "false" | conv.ToBool }},
+    'allow_robots' => {{ getenv "FRESHRSS_ALLOW_ROBOTS" "false" }},
-    'allow_referrer' => {{ getenv "FRESHRSS_ALLOW_REFERRER" "false" | conv.ToBool }},
+    'allow_referrer' => {{ getenv "FRESHRSS_ALLOW_REFERRER" "false" }},
 
     'limits' => array(
         'cookie_duration' => {{ getenv "FRESHRSS_LIMITS_COOKIE_DURATION" "2592000" }},
@@ -29,25 +29,25 @@ return array(
     ),
 
     'curl_options' => array(
-        {{- if not (getenv "FRESHRSS_CURLOPT_SSL_VERIFYHOST" "true" | conv.ToBool) }}
+        {{- if not (bool (getenv "FRESHRSS_CURLOPT_SSL_VERIFYHOST" "true")) }}
         CURLOPT_SSL_VERIFYHOST => {{ getenv "FRESHRSS_CURLOPT_SSL_VERIFYHOST" }},
         {{- end }}
-        {{- if not (getenv "FRESHRSS_CURLOPT_SSL_VERIFYPEER" "true" | conv.ToBool) }}
+        {{- if not (bool (getenv "FRESHRSS_CURLOPT_SSL_VERIFYPEER" "true")) }}
         CURLOPT_SSL_VERIFYPEER => {{ getenv "FRESHRSS_CURLOPT_SSL_VERIFYPEER" }},
         {{- end }}
-        {{- if not (getenv "FRESHRSS_CURLOPT_PROXYTYPE" "true" | conv.ToBool) }}
+        {{- if not (bool (getenv "FRESHRSS_CURLOPT_PROXYTYPE" "true")) }}
         CURLOPT_PROXYTYPE => {{ getenv "FRESHRSS_CURLOPT_PROXYTYPE" }},
         {{- end }}
-        {{- if not (getenv "FRESHRSS_CURLOPT_PROXY" "true" | conv.ToBool ) }}
+        {{- if not (bool (getenv "FRESHRSS_CURLOPT_PROXY" "true" )) }}
         CURLOPT_PROXY => '{{ getenv "FRESHRSS_CURLOPT_PROXY" }}',
         {{- end }}
-        {{- if not (getenv "FRESHRSS_CURLOPT_PROXYPORT" "true" | conv.ToBool ) }}
+        {{- if not (bool (getenv "FRESHRSS_CURLOPT_PROXYPORT" "true" )) }}
         CURLOPT_PROXYPORT => {{ getenv "FRESHRSS_CURLOPT_PROXYPORT" }},
         {{- end }}
-        {{- if not (getenv "FRESHRSS_CURLOPT_PROXYAUTH" "true" | conv.ToBool ) }}
+        {{- if not (bool (getenv "FRESHRSS_CURLOPT_PROXYAUTH" "true" )) }}
         CURLOPT_PROXYAUTH => {{ getenv "FRESHRSS_CURLOPT_PROXYAUTH" }},
         {{- end }}
-        {{- if not (getenv "FRESHRSS_CURLOPT_PROXYUSERPWD" "true" | conv.ToBool ) }}
+        {{- if not (bool (getenv "FRESHRSS_CURLOPT_PROXYUSERPWD" "true" )) }}
         CURLOPT_PROXYUSERPWD => '{{ getenv "FRESHRSS_CURLOPT_PROXYUSERPWD" }}',
         {{- end }}
     ),
@@ -71,10 +71,4 @@ return array(
     ),
 
     'disable_update' => true,
-
-    'trusted_sources' => [
-        {{- range (getenv "FRESHRSS_TRUSTED_SOURCES" "127.0.0.0/8,::1/128" | strings.Split ",") }}
-        '{{ . | strings.TrimSpace }}',
-        {{- end }}
-    ]
 );

overlay/etc/templates/constants.local.php.tmpl

@@ -1,15 +1,15 @@
 <?php
-define('FRESHRSS_USERAGENT', 'FreshRSS/' . FRESHRSS_VERSION . ' (' . PHP_OS . '; ' . FRESHRSS_WEBSITE . ')');
+safe_define('FRESHRSS_USERAGENT', 'FreshRSS/' . FRESHRSS_VERSION . ' (' . PHP_OS . '; ' . FRESHRSS_WEBSITE . ')');
-define('PHP_COMPRESSION', false);
+safe_define('PHP_COMPRESSION', false);
-define('COPY_SYSLOG_TO_STDERR', true);
+safe_define('COPY_SYSLOG_TO_STDERR', true);
-define('MAX_LOG_SIZE', 1048576);
+safe_define('MAX_LOG_SIZE', 1048576);
-define('DATA_PATH', FRESHRSS_PATH . '/data');
+safe_define('DATA_PATH', FRESHRSS_PATH . '/data');
 
-define('UPDATE_FILENAME', DATA_PATH . '/update.php');
+safe_define('UPDATE_FILENAME', DATA_PATH . '/update.php');
-define('USERS_PATH', DATA_PATH . '/users');
+safe_define('USERS_PATH', DATA_PATH . '/users');
-define('ADMIN_LOG', USERS_PATH . '/_/log.txt');
+safe_define('ADMIN_LOG', USERS_PATH . '/_/log.txt');
-define('API_LOG', USERS_PATH . '/_/log_api.txt');
+safe_define('API_LOG', USERS_PATH . '/_/log_api.txt');
-define('CACHE_PATH', DATA_PATH . '/cache');
+safe_define('CACHE_PATH', DATA_PATH . '/cache');
-define('PSHB_LOG', USERS_PATH . '/_/log_pshb.txt');
+safe_define('PSHB_LOG', USERS_PATH . '/_/log_pshb.txt');
-define('PSHB_PATH', DATA_PATH . '/PubSubHubbub');
+safe_define('PSHB_PATH', DATA_PATH . '/PubSubHubbub');
-define('TMP_PATH', CACHE_PATH);
+safe_define('TMP_PATH', CACHE_PATH);

overlay/etc/templates/php.ini.tmpl

@@ -19,9 +19,9 @@ implicit_flush = Off
 unserialize_callback_func =
 serialize_precision = 17
 
-open_basedir = "/var/www/app:/var/lib/php/tmp_upload:/var/lib/php/session:/var/lib/php/soap_cache:/tmp"
+open_basedir = "/var/www/app:/var/lib/php/tmp_upload:/var/lib/php/session:/var/lib/php/soap_cache"
 
-disable_functions = system, exec, shell_exec, phpinfo, show_source, highlight_file, popen, proc_open, fopen_with_path, dbmopen, dbase_open, move_uploaded_file, chmod, filepro, filepro_rowcount, filepro_retrieve, posix_mkfifo
+disable_functions = system, exec, shell_exec, phpinfo, show_source, highlight_file, popen, proc_open, fopen_with_path, dbmopen, dbase_open, move_uploaded_file, chmod, rename, filepro, filepro_rowcount, filepro_retrieve, posix_mkfifo
 disable_classes =
 
 ;highlight.string  = #DD0000
@@ -86,12 +86,12 @@ default_charset = "UTF-8"
 ;input_encoding =
 ;output_encoding =
 
-;include_path = ".:/php81/includes"
+;include_path = ".:/php7/includes"
 
 doc_root =
 user_dir =
 
-extension_dir = "/usr/lib/php81/modules"
+extension_dir = "/usr/lib/php7/modules"
 ;sys_temp_dir = "/tmp"
 enable_dl = Off
 
@@ -250,7 +250,7 @@ pgsql.log_notice = 0
 bcmath.scale = 0
 
 [browscap]
-browscap = /etc/php81/browscap.ini
+browscap = /etc/php7/browscap.ini
 
 [Session]
 session.save_handler = files
@@ -327,7 +327,7 @@ zend.assertions = -1
 ;exif.decode_jis_intel = JIS
 
 [Tidy]
-;tidy.default_config = /usr/local/lib/php81/default.tcfg
+;tidy.default_config = /usr/local/lib/php7/default.tcfg
 tidy.clean_output = Off
 
 [soap]

overlay/usr/local/bin/entrypoint

@@ -1,61 +1,40 @@
 #!/usr/bin/env sh
 
-# shellcheck disable=SC1091
+/usr/local/bin/gomplate -V -o /etc/php7/php.ini -f /etc/templates/php.ini.tmpl
-. /usr/local/lib/log.sh
+/usr/local/bin/gomplate -V -o /var/www/app/data/config.php -f /etc/templates/config.php.tmpl
-
+/usr/local/bin/gomplate -V -o /var/www/app/constants.local.php -f /etc/templates/constants.local.php.tmpl
-/usr/local/bin/gomplate -o /etc/php81/php.ini -f /etc/templates/php.ini.tmpl
-/usr/local/bin/gomplate -o /var/www/app/constants.local.php -f /etc/templates/constants.local.php.tmpl
 
 if [ -n "${FRESHRSS_POSTGRES_SSL_ROOTCERT}" ] && [ ! -f "/var/www/.postgresql/root.crt" ]; then
     ln -s "${FRESHRSS_POSTGRES_SSL_ROOTCERT}" /var/www/.postgresql/root.crt
 fi
 
-log_info "Prepare FreshRSS"
+printf "\nPrepare FreshRSS...\n"
-/usr/bin/php -f ./cli/prepare.php >/dev/null 2>&1
+PREP=$(/usr/bin/php -f ./cli/prepare.php)
-
+if [ $? -ne 0 ]; then
-ERROR=$(/usr/bin/php -f ./cli/do-install.php -- --api_enabled \
+    echo "$PREP"
-    --base_url "${FRESHRSS_BASE_URL:-http://localhost/}" \
+    exit 1
-    --db-base "${FRESHRSS_DB_BASE}" \
-    --db-host "${FRESHRSS_DB_HOST:-localhost}" \
-    --db-password "${FRESHRSS_DB_PASSWORD}" \
-    --db-type "${FRESHRSS_DB_TYPE:-sqlite}" \
-    --db-user "${FRESHRSS_DB_USER}" \
-    --default_user "${FRESHRSS_DEFAULT_USER:-admin}" \
-    --language "${FRESHRSS_LANGUAGE:-en}" \
-    2>&1)
-EXITCODE=$?
-
-if [ $EXITCODE -eq 3 ]; then
-    log_info "FreshRSS already installed, skipped"
-elif [ $EXITCODE -eq 0 ]; then
-    log_info "FreshRSS successfully installed"
-else
-    log_error "FreshRSS error during installation: ${ERROR}"
-    exit $EXITCODE
 fi
 
-log_info "Ensure default user exists"
+if [ "${FRESHRSS_DEFAULT_USER}" ]; then
-ERROR=$(/usr/bin/php ./cli/create-user.php \
+    printf "\nEnsure default user exists...\n"
-    --user "${FRESHRSS_DEFAULT_USER:-admin}" \
+    UCREATE=$(/usr/bin/php ./cli/create-user.php --user "$FRESHRSS_DEFAULT_USER" --password "$FRESHRSS_DEFAULT_PASSWORD" 2>&1)
-    --password "${FRESHRSS_DEFAULT_PASSWORD:-freshrss}" \
+    if [ $? -ne 0 ]; then
-    --language "${FRESHRSS_LANGUAGE:-en}" \
+        case "$UCREATE" in
-    2>&1)
+          *"username already taken"*) ;;
-EXITCODE=$?
+          *)
-
+          echo "$UCREATE"
-if [ $EXITCODE -eq 3 ]; then
+          rm -rf "/var/www/app/data/users/$FRESHRSS_DEFAULT_USER"
-    log_info "FreshRSS user already exists, skipped"
+          exit 1
-elif [ $EXITCODE -eq 0 ]; then
+          ;;
-    log_info "FreshRSS user successfully created"
+        esac
-    ./cli/list-users.php | xargs -n1 ./cli/actualize-user.php --user "${FRESHRSS_DEFAULT_USER:-admin}"
+    fi
-    ./cli/access-permissions.sh
+    printf "Result: success\n\n"
-else
-    log_error "FreshRSS error during the creation of a user: ${ERROR}"
-    exit $EXITCODE
 fi
 
-/usr/local/bin/gomplate -o /var/www/app/data/config.php -f /etc/templates/config.php.tmpl
+if [ -f "/var/www/app/data/do-install.txt" ]; then
+    rm -rf /var/www/app/data/do-install.txt
+fi
 
-log_info "Start FreshRSS Server\n"
 supercronic /etc/crontabs/nginx &
-php-fpm81 -F &
+php-fpm7 -F &
 exec nginx -g "daemon off;"

overlay/usr/local/bin/healthcheck

@@ -1,12 +1,3 @@
 #!/usr/bin/env sh
 
-# shellcheck disable=SC3040
+(php -r "readfile('http://localhost:8080/i/');" | grep -q 'jsonVars') || exit 1
-set -eo pipefail
-
-if [ "$(gomplate -i '{{ getenv "FRESHRSS_API_ENABLED" "false" | conv.ToBool }}')" = "true" ]; then
-    (php -r "readfile('http://127.0.0.1:8080/api/fever.php');" | grep -q 'api_version') || exit 1
-else
-    (php -r "readfile('http://127.0.0.1:8080/i/');" | grep -q 'jsonVars') || exit 1
-fi
-
-exit 0

renovate.json

@@ -1,4 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": ["github>thegeeklab/renovate-presets:docker"]
-}