From 0fc8259931197ad31c6e7f1dc670500538ac47d6 Mon Sep 17 00:00:00 2001 From: Alex Phillips Date: Sat, 22 Jun 2024 08:23:17 -0400 Subject: [PATCH 1/8] config files no longer used, now stored in sqlite db, fixed docs specifying ES authentication, default to off --- README.md | 6 +--- readme-vars.yml | 4 +-- .../s6-rc.d/init-diskover-config/run | 33 ------------------- 3 files changed, 2 insertions(+), 41 deletions(-) diff --git a/README.md b/README.md index 205e70b0..8ee837d5 100644 --- a/README.md +++ b/README.md @@ -104,7 +104,7 @@ services: image: docker.elastic.co/elasticsearch/elasticsearch:7.10.2 environment: - discovery.type=single-node - - xpack.security.enabled=true + - xpack.security.enabled=false - bootstrap.memory_lock=true - "ES_JAVA_OPTS=-Xms1g -Xmx1g" ulimits: @@ -134,8 +134,6 @@ docker run -d \ -e TZ=Etc/UTC \ -e ES_HOST=elasticsearch \ -e ES_PORT=9200 \ - -e ES_USER=elastic \ - -e ES_PASS=changeme \ -p 80:80 \ -v /path/to/diskover/config:/config \ -v /path/to/diskover/data:/data \ @@ -155,8 +153,6 @@ Containers are configured using parameters passed at runtime (such as those abov | `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). | | `-e ES_HOST=elasticsearch` | ElasticSearch host (optional) | | `-e ES_PORT=9200` | ElasticSearch port (optional) | -| `-e ES_USER=elastic` | ElasticSearch username (optional) | -| `-e ES_PASS=changeme` | ElasticSearch password (optional) | | `-v /config` | Persistent config files | | `-v /data` | Default mount point to crawl | diff --git a/readme-vars.yml b/readme-vars.yml index bbeee5cc..7276b378 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -27,8 +27,6 @@ param_env_vars: - { env_var: "TZ", env_value: "America/New_York", desc: "Specify a timezone to use EG America/New_York"} - { env_var: "ES_HOST", env_value: "elasticsearch", desc: "ElasticSearch host (optional)"} - { env_var: "ES_PORT", env_value: "9200", desc: "ElasticSearch port (optional)"} - - { env_var: "ES_USER", env_value: "elastic", desc: "ElasticSearch username (optional)"} - - { env_var: "ES_PASS", env_value: "changeme", desc: "ElasticSearch password (optional)"} custom_compose: | version: '2' @@ -56,7 +54,7 @@ custom_compose: | image: docker.elastic.co/elasticsearch/elasticsearch:7.10.2 environment: - discovery.type=single-node - - xpack.security.enabled=true + - xpack.security.enabled=false - bootstrap.memory_lock=true - "ES_JAVA_OPTS=-Xms1g -Xmx1g" ulimits: diff --git a/root/etc/s6-overlay/s6-rc.d/init-diskover-config/run b/root/etc/s6-overlay/s6-rc.d/init-diskover-config/run index 5b99b126..3cd1fec6 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-diskover-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-diskover-config/run @@ -1,49 +1,16 @@ #!/usr/bin/with-contenv bash # shellcheck shell=bash -# copy config -if [[ ! -e /config/diskover.conf.d ]]; then - cp -r /app/diskover/configs_sample /config/diskover.conf.d -fi - # setup web mkdir -p \ /config/diskover-web.conf.d -# copy over sample config files -if [[ -d /app/diskover-web/public ]]; then - cd /app/diskover-web/public || exit 1 - for file in *.sample; do - dest=${file%.sample} - if [[ ! -e "/config/diskover-web.conf.d/$dest" ]]; then - cp "/app/diskover-web/public/$file" "/config/diskover-web.conf.d/$dest" - fi - ln -sf "/config/diskover-web.conf.d/$dest" "/app/diskover-web/public/$dest" - done -fi - -if [[ -d /app/diskover-web/public/tasks ]]; then - cd /app/diskover-web/public/tasks || exit 1 - for file in *.sample; do - dest=${file%.sample} - if [[ ! -e "/config/diskover-web.conf.d/$dest" ]]; then - cp "/app/diskover-web/public/tasks/$file" "/config/diskover-web.conf.d/$dest" - fi - ln -sf "/config/diskover-web.conf.d/$dest" "/app/diskover-web/public/tasks/$dest" - done -fi - # touch db if [[ ! -e "/config/diskoverdb.sqlite3" ]]; then touch /config/diskoverdb.sqlite3 fi ln -sf /config/diskoverdb.sqlite3 /app/diskover-web/diskoverdb.sqlite3 -# copy and set variables in Constants.php -if [[ ! -e "/config/diskover-web.conf.d/Constants.php" ]]; then - cp /app/diskover-web/src/diskover/Constants.php.sample /config/diskover-web.conf.d/Constants.php -fi - ln -sf /config/diskover-web.conf.d/Constants.php /app/diskover-web/src/diskover/Constants.php lsiown -R abc:abc /config From 4054776b6bfb5f3c40b7eadec184eafe52020239 Mon Sep 17 00:00:00 2001 From: Alex Phillips Date: Sat, 22 Jun 2024 15:30:31 -0400 Subject: [PATCH 2/8] modified to support upcoming 2.3.0 release --- Dockerfile | 2 ++ root/etc/s6-overlay/s6-rc.d/init-diskover-config/run | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 762ad505..150d1b4f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,6 +11,8 @@ LABEL maintainer="alex-phillips" # environment settings ENV DISKOVERDIR=/config/diskover.conf.d/diskover/ +ENV DATABASE=/config/diskoverdb.sqlite3 +ENV ES_HOST=elasticsearch RUN \ echo "**** install build packages ****" && \ diff --git a/root/etc/s6-overlay/s6-rc.d/init-diskover-config/run b/root/etc/s6-overlay/s6-rc.d/init-diskover-config/run index 3cd1fec6..2e5f8fb4 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-diskover-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-diskover-config/run @@ -9,8 +9,5 @@ mkdir -p \ if [[ ! -e "/config/diskoverdb.sqlite3" ]]; then touch /config/diskoverdb.sqlite3 fi -ln -sf /config/diskoverdb.sqlite3 /app/diskover-web/diskoverdb.sqlite3 - -ln -sf /config/diskover-web.conf.d/Constants.php /app/diskover-web/src/diskover/Constants.php lsiown -R abc:abc /config From db1d835df0b745f45d5edad6642927d4aa04ecb2 Mon Sep 17 00:00:00 2001 From: Alex Phillips Date: Sat, 29 Jun 2024 08:01:20 -0400 Subject: [PATCH 3/8] removed unused packages, updated ES version in compose example --- Dockerfile | 2 -- README.md | 2 +- readme-vars.yml | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 150d1b4f..9077b7a5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,9 +25,7 @@ RUN \ python3-dev && \ echo "**** install runtime packages ****" && \ apk add --no-cache \ - libldap \ ncurses \ - php83-ldap \ php83-sqlite3 \ python3 && \ echo "**** configure php-fpm to pass env vars ****" && \ diff --git a/README.md b/README.md index 8ee837d5..c1d694e2 100644 --- a/README.md +++ b/README.md @@ -101,7 +101,7 @@ services: - elasticsearch elasticsearch: container_name: elasticsearch - image: docker.elastic.co/elasticsearch/elasticsearch:7.10.2 + image: docker.elastic.co/elasticsearch/elasticsearch:7.17.22 environment: - discovery.type=single-node - xpack.security.enabled=false diff --git a/readme-vars.yml b/readme-vars.yml index 7276b378..2ea17964 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -51,7 +51,7 @@ custom_compose: | - elasticsearch elasticsearch: container_name: elasticsearch - image: docker.elastic.co/elasticsearch/elasticsearch:7.10.2 + image: docker.elastic.co/elasticsearch/elasticsearch:7.17.22 environment: - discovery.type=single-node - xpack.security.enabled=false From 4d9078008af995e77abd28ef5855b7812cbfe014 Mon Sep 17 00:00:00 2001 From: Alex Phillips Date: Fri, 6 Sep 2024 17:21:54 -0400 Subject: [PATCH 4/8] updated to use 3.20, fixed nginx config http2, updated arm file --- Dockerfile | 2 +- Dockerfile.aarch64 | 6 +++--- root/defaults/nginx/site-confs/default.conf.sample | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9077b7a5..d0bc5d5e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.19 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.20 # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 2ddc307e..3c5b789c 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.19 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.20 # set version label ARG BUILD_DATE @@ -11,6 +11,8 @@ LABEL maintainer="alex-phillips" # environment settings ENV DISKOVERDIR=/config/diskover.conf.d/diskover/ +ENV DATABASE=/config/diskoverdb.sqlite3 +ENV ES_HOST=elasticsearch RUN \ echo "**** install build packages ****" && \ @@ -23,9 +25,7 @@ RUN \ python3-dev && \ echo "**** install runtime packages ****" && \ apk add --no-cache \ - libldap \ ncurses \ - php83-ldap \ php83-sqlite3 \ python3 && \ echo "**** configure php-fpm to pass env vars ****" && \ diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index 2563a1da..ac6a91d4 100644 --- a/root/defaults/nginx/site-confs/default.conf.sample +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -4,8 +4,8 @@ server { listen 80 default_server; listen [::]:80 default_server; - listen 443 ssl http2 default_server; - listen [::]:443 ssl http2 default_server; + listen 443 ssl default_server; + listen [::]:443 ssl default_server; server_name _; From c43f4f89bf3585d651ff081f4603d7203fa61fb3 Mon Sep 17 00:00:00 2001 From: thespad Date: Fri, 6 Sep 2024 22:35:49 +0100 Subject: [PATCH 5/8] Add version print --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + 2 files changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index d0bc5d5e..68e51949 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,6 +50,7 @@ RUN \ wheel && \ pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ \ -r requirements.txt && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 3c5b789c..70f52eb2 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -50,6 +50,7 @@ RUN \ wheel && \ pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ \ -r requirements.txt && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ From 9c3d8a3ec459750e47ac85836677b8a0b4ef1d7d Mon Sep 17 00:00:00 2001 From: thespad Date: Fri, 6 Sep 2024 22:37:01 +0100 Subject: [PATCH 6/8] Fix wheel search path --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 68e51949..85677e0e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,7 +48,7 @@ RUN \ pip install -U --no-cache-dir \ pip \ wheel && \ - pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \ -r requirements.txt && \ printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 70f52eb2..974c2a28 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -48,7 +48,7 @@ RUN \ pip install -U --no-cache-dir \ pip \ wheel && \ - pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.19/ \ + pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \ -r requirements.txt && \ printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ From 2f6017e16056c74f697839df0bd39b659ae12c8a Mon Sep 17 00:00:00 2001 From: thespad Date: Fri, 6 Sep 2024 22:37:29 +0100 Subject: [PATCH 7/8] Update changelog --- jenkins-vars.yml | 5 ++--- readme-vars.yml | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 9e303f29..75f7fd6c 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -6,7 +6,6 @@ external_type: github_stable release_type: stable release_tag: latest ls_branch: master -build_armhf: false repo_vars: - EXT_GIT_BRANCH = 'master' - EXT_USER = 'diskoverdata' @@ -25,6 +24,6 @@ repo_vars: - CI_PORT='80' - CI_SSL='false' - CI_DELAY='120' - - CI_DOCKERENV='TZ=US/Pacific' - - CI_AUTH='user:password' + - CI_DOCKERENV='' + - CI_AUTH='' - CI_WEBPATH='' diff --git a/readme-vars.yml b/readme-vars.yml index 2ea17964..c370d718 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -24,7 +24,6 @@ param_ports: - { external_port: "80", internal_port: "80", port_desc: "diskover Web UI" } param_usage_include_env: true param_env_vars: - - { env_var: "TZ", env_value: "America/New_York", desc: "Specify a timezone to use EG America/New_York"} - { env_var: "ES_HOST", env_value: "elasticsearch", desc: "ElasticSearch host (optional)"} - { env_var: "ES_PORT", env_value: "9200", desc: "ElasticSearch port (optional)"} @@ -91,6 +90,7 @@ app_setup_block: | # changelog changelogs: + - { date: "06.09.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings." } - { date: "06.03.24:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf." } - { date: "06.03.24:", desc: "Rebase to Alpine 3.19 with php 8.3."} - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." } From 57dd42865283e447fe1e3e6ea39511b6b528b208 Mon Sep 17 00:00:00 2001 From: thespad Date: Fri, 6 Sep 2024 22:38:53 +0100 Subject: [PATCH 8/8] Update nginx conf date --- root/defaults/nginx/site-confs/default.conf.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index ac6a91d4..3cfcb1fe 100644 --- a/root/defaults/nginx/site-confs/default.conf.sample +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -1,4 +1,4 @@ -## Version 2024/03/06 - Changelog: https://github.com/linuxserver/docker-diskover/commits/master/root/defaults/nginx/site-confs/default.conf.sample +## Version 2024/09/06 - Changelog: https://github.com/linuxserver/docker-diskover/commits/master/root/defaults/nginx/site-confs/default.conf.sample server { listen 80 default_server;