Compare commits

..

37 Commits

Author SHA1 Message Date
7c77c546af
fix: add /tmp to open_basedir as its required for exports
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
2023-10-31 10:55:34 +01:00
633ca0c22b chore(docker): update thegeeklab/nginx:latest docker digest to 72ffd57
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-10-18 17:32:57 +00:00
d57a471cdb chore(docker): update thegeeklab/nginx:latest docker digest to 35d0f3c
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-10-17 15:33:00 +00:00
b34da44c55 chore(docker): update thegeeklab/nginx:latest docker digest to 4ea006f
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-09-28 23:33:55 +00:00
bafa3f26b9 chore(docker): update thegeeklab/nginx:latest docker digest to 1d87436
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-08-17 15:04:08 +00:00
1e8b43cf38 chore(docker): update thegeeklab/nginx:latest docker digest to 121f567
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-08-07 22:33:34 +00:00
2daccd31cc chore(docker): update thegeeklab/nginx:latest docker digest to 41aac35
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-07-21 18:03:40 +00:00
69030d45d0 chore(docker): update thegeeklab/nginx:latest docker digest to 1900d37
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-06-15 07:03:13 +00:00
2101d158fe chore(docker): update thegeeklab/nginx:latest docker digest to 98aeff1
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-06-15 02:02:49 +00:00
f38214cebc chore(docker): update thegeeklab/nginx:latest docker digest to 24b611e
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-06-15 00:02:57 +00:00
171a862118 chore(docker): update thegeeklab/nginx:latest docker digest to 3f20aac
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-06-14 21:40:42 +00:00
3e12dd8145 fix: fix typo in api healthcheck (#106)
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
Reviewed-on: docker/freshrss#106
2023-06-11 00:20:49 +02:00
ab2ed79a3a fix: use api url for healthcheck if enabled (#105)
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
Reviewed-on: docker/freshrss#105
2023-06-10 23:55:34 +02:00
5aebe22bc9 chore(docker): update thegeeklab/nginx:latest docker digest to 73bfe01
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-06-05 09:03:32 +00:00
25219a8eb7 chore(docker): update thegeeklab/nginx:latest docker digest to dab0bf7
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-05-30 20:33:40 +00:00
193baa4b98 chore(docker): update thegeeklab/nginx:latest docker digest to b68d37d
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-05-29 12:03:46 +00:00
ac74f737f3 chore(docker): update thegeeklab/nginx:latest docker digest to 546c03e
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
2023-05-26 11:03:30 +00:00
681426c0ca chore(docker): update thegeeklab/nginx:latest docker digest to 9ff6cf3
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-04-24 17:33:27 +00:00
c47a82342c chore(docker): update thegeeklab/nginx:latest docker digest to b50b7d7
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-04-18 02:34:50 +00:00
c564361b50 chore(docker): update thegeeklab/nginx:latest docker digest to e0a65fd
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-04-14 17:33:08 +00:00
f5a68c7bfe chore(docker): update thegeeklab/nginx:latest docker digest to 378f3e4
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-03-29 21:32:58 +00:00
f32520673d chore(docker): update thegeeklab/nginx:latest docker digest to d9c0983
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
continuous-integration/drone/tag Build is passing
2023-03-13 18:03:05 +00:00
337b30486a chore(deps): update dependency freshrss/freshrss to v1.21.0 (#95)
All checks were successful
continuous-integration/drone/push Build is passing
Co-authored-by: Renovator Bot <renovator@rknet.org>
Co-committed-by: Renovator Bot <renovator@rknet.org>
2023-03-09 08:51:21 +01:00
9773f325a5 chore(docker): update thegeeklab/nginx:latest docker digest to 8d27f2f
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-03-02 14:03:07 +00:00
2192457cca chore(docker): update thegeeklab/nginx:latest docker digest to 2e25c7c
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-03-02 13:03:08 +00:00
23cdc2cbc5 chore(docker): update thegeeklab/nginx:latest docker digest to 38d46af
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-02-24 23:32:51 +00:00
359705f543 chore(docker): update thegeeklab/nginx:latest docker digest to 8a70210
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-02-23 21:32:51 +00:00
18eb8cf9be chore(docker): update thegeeklab/nginx:latest docker digest to 2dcdeb3
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-02-11 06:32:48 +00:00
536b205f5a chore(docker): update thegeeklab/nginx:latest docker digest to 44272d8
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-02-10 23:02:42 +00:00
432e67bfcb chore(docker): update thegeeklab/nginx:latest docker digest to 21c00a9
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-02-09 10:02:46 +00:00
a70b3d3712
ci: bump container build plugin to drone-docker-buildx:23
All checks were successful
continuous-integration/drone/push Build is passing
2023-02-09 10:32:17 +01:00
1c06fccebc chore(docker): update thegeeklab/nginx:latest docker digest to 006eb2d (#87)
All checks were successful
continuous-integration/drone/push Build is passing
Co-authored-by: Renovator Bot <renovator@rknet.org>
Co-committed-by: Renovator Bot <renovator@rknet.org>
2023-02-08 21:50:19 +01:00
cc29ed120b
fix drone-matrix template
All checks were successful
continuous-integration/drone/push Build is passing
2023-02-08 21:22:12 +01:00
bf52e7e5f4 chore(docker): update thegeeklab/nginx:latest docker digest to bcf46df
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-01-15 16:32:35 +00:00
790b9a554c refactor: use buildx for multiarch container builds (#85)
All checks were successful
continuous-integration/drone/push Build is passing
2023-01-15 17:07:40 +01:00
deaa9a3a30 chore(docker): update thegeeklab/nginx:latest docker digest to 4dd08de
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-01-15 00:03:00 +00:00
f4aa4c63ae chore(docker): update thegeeklab/nginx:latest docker digest to 4ddcc3d
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2023-01-09 18:32:49 +00:00
6 changed files with 30 additions and 23 deletions

View File

@ -28,12 +28,11 @@ platform:
steps: steps:
- name: dryrun - name: dryrun
image: thegeeklab/drone-docker-buildx:20 image: thegeeklab/drone-docker-buildx:23
settings: settings:
build_args:
- BUILD_VERSION=${DRONE_TAG%-*}
dockerfile: Dockerfile dockerfile: Dockerfile
dry_run: true dry_run: true
provenance: false
repo: thegeeklab/${DRONE_REPO_NAME} repo: thegeeklab/${DRONE_REPO_NAME}
when: when:
ref: ref:
@ -70,13 +69,12 @@ steps:
- changelog-generate - changelog-generate
- name: publish-dockerhub - name: publish-dockerhub
image: thegeeklab/drone-docker-buildx:20 image: thegeeklab/drone-docker-buildx:23
settings: settings:
build_args:
- BUILD_VERSION=${DRONE_TAG%-*}
dockerfile: Dockerfile dockerfile: Dockerfile
password: password:
from_secret: docker_password from_secret: docker_password
provenance: false
repo: thegeeklab/${DRONE_REPO_NAME} repo: thegeeklab/${DRONE_REPO_NAME}
username: username:
from_secret: docker_username from_secret: docker_username
@ -88,13 +86,12 @@ steps:
- changelog-format - changelog-format
- name: publish-quay - name: publish-quay
image: thegeeklab/drone-docker-buildx:20 image: thegeeklab/drone-docker-buildx:23
settings: settings:
build_args:
- BUILD_VERSION=${DRONE_TAG%-*}
dockerfile: Dockerfile dockerfile: Dockerfile
password: password:
from_secret: quay_password from_secret: quay_password
provenance: false
registry: quay.io registry: quay.io
repo: quay.io/thegeeklab/${DRONE_REPO_NAME} repo: quay.io/thegeeklab/${DRONE_REPO_NAME}
username: username:
@ -176,7 +173,7 @@ steps:
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 }}){{/if}} by {{ commit.Author }}<br/> Message: {{ commit.Message.Title }}" 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 }}"
username: username:
from_secret: matrix_username from_secret: matrix_username
when: when:
@ -197,6 +194,6 @@ depends_on:
--- ---
kind: signature kind: signature
hmac: 07c057dfd06b861ee2213ff0f86e517c52aea018985cd84d90c69c7d21483116 hmac: cba07850e21c648f8558e69aa7e5a561ef473fe2a3a7890bf308a57c73ea0343
... ...

View File

@ -1,4 +1,4 @@
FROM thegeeklab/nginx:latest@sha256:1b4a55c078486ffab6b8bb96def236b47f07574f5966cedcf9ce68de0d529fe8 FROM thegeeklab/nginx:latest@sha256:72ffd57b6b89013f6b4c6a8a97728120df1dfac0d66b2164e0aacba21ee87380
LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>" LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>" LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"
@ -10,7 +10,7 @@ LABEL org.opencontainers.image.documentation="https://gitea.rknet.org/docker/fre
ARG BUILD_VERSION ARG BUILD_VERSION
# renovate: datasource=github-releases depName=FreshRSS/FreshRSS # renovate: datasource=github-releases depName=FreshRSS/FreshRSS
ENV FRESHRSS_VERSION="${BUILD_VERSION:-1.20.2}" ENV FRESHRSS_VERSION="${BUILD_VERSION:-1.21.0}"
ADD overlay/ / ADD overlay/ /

View File

@ -8,15 +8,15 @@ return array(
'title' => '{{ getenv "FRESHRSS_TITLE" "FreshRSS" }}', 'title' => '{{ getenv "FRESHRSS_TITLE" "FreshRSS" }}',
'meta_description' => '{{ getenv "FRESHRSS_META_DESCRIPTION" }}', 'meta_description' => '{{ getenv "FRESHRSS_META_DESCRIPTION" }}',
'default_user' => '{{ getenv "FRESHRSS_DEFAULT_USER" "admin" }}', 'default_user' => '{{ getenv "FRESHRSS_DEFAULT_USER" "admin" }}',
'allow_anonymous' => {{ getenv "FRESHRSS_ALLOW_ANONYMOUS" "false" }}, 'allow_anonymous' => {{ getenv "FRESHRSS_ALLOW_ANONYMOUS" "false" | conv.ToBool }},
'allow_anonymous_refresh' => {{ getenv "FRESHRSS_ALLOW_ANONYMOUS_REFRESH" "false" }}, 'allow_anonymous_refresh' => {{ getenv "FRESHRSS_ALLOW_ANONYMOUS_REFRESH" "false" | conv.ToBool }},
'auth_type' => '{{ getenv "FRESHRSS_AUTH_TYPE" "form" }}', 'auth_type' => '{{ getenv "FRESHRSS_AUTH_TYPE" "form" }}',
'api_enabled' => {{ getenv "FRESHRSS_API_ENABLED" "false" }}, 'api_enabled' => {{ getenv "FRESHRSS_API_ENABLED" "false" | conv.ToBool }},
'unsafe_autologin_enabled' => {{ getenv "FRESHRSS_UNSAFE_AUTOLOGIN_ENABLED" "false" }}, 'unsafe_autologin_enabled' => {{ getenv "FRESHRSS_UNSAFE_AUTOLOGIN_ENABLED" "false" | conv.ToBool }},
'simplepie_syslog_enabled' => {{ getenv "FRESHRSS_SIMPLEPIE_SYSLOG_ENABLED" "true" }}, 'simplepie_syslog_enabled' => {{ getenv "FRESHRSS_SIMPLEPIE_SYSLOG_ENABLED" "true" | conv.ToBool }},
'pubsubhubbub_enabled' => {{ getenv "FRESHRSS_PUBSUBHUBBUB_ENABLED" "false" }}, 'pubsubhubbub_enabled' => {{ getenv "FRESHRSS_PUBSUBHUBBUB_ENABLED" "false" | conv.ToBool }},
'allow_robots' => {{ getenv "FRESHRSS_ALLOW_ROBOTS" "false" }}, 'allow_robots' => {{ getenv "FRESHRSS_ALLOW_ROBOTS" "false" | conv.ToBool }},
'allow_referrer' => {{ getenv "FRESHRSS_ALLOW_REFERRER" "false" }}, 'allow_referrer' => {{ getenv "FRESHRSS_ALLOW_REFERRER" "false" | conv.ToBool }},
'limits' => array( 'limits' => array(
'cookie_duration' => {{ getenv "FRESHRSS_LIMITS_COOKIE_DURATION" "2592000" }}, 'cookie_duration' => {{ getenv "FRESHRSS_LIMITS_COOKIE_DURATION" "2592000" }},

View File

@ -19,7 +19,7 @@ implicit_flush = Off
unserialize_callback_func = unserialize_callback_func =
serialize_precision = 17 serialize_precision = 17
open_basedir = "/var/www/app:/var/lib/php/tmp_upload:/var/lib/php/session:/var/lib/php/soap_cache" open_basedir = "/var/www/app:/var/lib/php/tmp_upload:/var/lib/php/session:/var/lib/php/soap_cache:/tmp"
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, filepro, filepro_rowcount, filepro_retrieve, posix_mkfifo
disable_classes = disable_classes =

View File

@ -47,6 +47,7 @@ if [ $EXITCODE -eq 3 ]; then
elif [ $EXITCODE -eq 0 ]; then elif [ $EXITCODE -eq 0 ]; then
log_info "FreshRSS user successfully created" log_info "FreshRSS user successfully created"
./cli/list-users.php | xargs -n1 ./cli/actualize-user.php --user "${FRESHRSS_DEFAULT_USER:-admin}" ./cli/list-users.php | xargs -n1 ./cli/actualize-user.php --user "${FRESHRSS_DEFAULT_USER:-admin}"
./cli/access-permissions.sh
else else
log_error "FreshRSS error during the creation of a user: ${ERROR}" log_error "FreshRSS error during the creation of a user: ${ERROR}"
exit $EXITCODE exit $EXITCODE

View File

@ -1,3 +1,12 @@
#!/usr/bin/env sh #!/usr/bin/env sh
(php -r "readfile('http://127.0.0.1:8080/i/');" | grep -q 'jsonVars') || exit 1 # shellcheck disable=SC3040
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