Merge pull request #43 from linuxserver/standard-base

Standard base

Author: nemchik

.github/workflows/call_invalid_helper.yml

@@ -0,0 +1,12 @@
+name: Comment on invalid interaction
+on:
+  issues:
+    types:
+      - labeled
+jobs:
+  add-comment-on-invalid:
+    if: github.event.label.name == 'invalid'
+    permissions:
+      issues: write
+    uses: linuxserver/github-workflows/.github/workflows/invalid-interaction-helper.yml@v1
+    secrets: inherit

Dockerfile

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.14
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.17
 
 # set version label
 ARG BUILD_DATE
@@ -7,30 +9,34 @@ ARG DISKOVER_RELEASE
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="alex-phillips"
 
+# environment settings
+ENV DISKOVERDIR=/config/diskover.conf.d/diskover/
+
 RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --virtual=build-dependencies \
     build-base \
-    gcc \
-    py3-pip \
-    python3-dev \
+    cargo \
     composer \
-    curl \
     git \
-    jq \
     nodejs \
-    npm && \
+    npm \
+    python3-dev && \
   echo "**** install runtime packages ****" && \
-  apk add --no-cache  \
+  apk add --no-cache \
     libldap \
     ncurses \
-    php7-curl \
-    php7-ldap \
-    php7-sqlite3 \
+    php81-curl \
+    php81-ldap \
+    php81-sqlite3 \
     py3-requests \
     py3-urllib3 \
     py3-xxhash \
     python3 && \
+  echo "**** configure php-fpm to pass env vars ****" && \
+  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php81/php-fpm.d/www.conf && \
+  grep -qxF 'clear_env = no' /etc/php81/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php81/php-fpm.d/www.conf && \
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php81/php-fpm.conf && \
   echo "**** install diskover ****" && \
   if [ -z ${DISKOVER_RELEASE+x} ]; then \
     DISKOVER_RELEASE=$(curl -sX GET "https://api.github.com/repos/diskoverdata/diskover-community/releases" \
@@ -43,17 +49,22 @@ RUN \
     /tmp/diskover.tar.gz -C \
     /app/ --strip-components=1 && \
   cd /app/diskover && \
-  pip3 install --no-cache-dir -r requirements.txt && \
-  sed -i 's@;clear_env = no@clear_env = no@' "/etc/php7/php-fpm.d/www.conf" && \
-  echo "**** overlay-fs workaround ****" && \
-  mv /app/diskover /app/diskover-tmp && \
-  mv /app/diskover-web /app/diskover-web-tmp && \
+  python3 -m ensurepip && \
+  pip3 install -U --no-cache-dir \
+    pip \
+    wheel && \
+  pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ -r requirements.txt && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \
   rm -rf \
     /tmp/* \
-    /root/.cache
+    $HOME/.cache \
+    $HOME/.cargo
 
 # add local files
-COPY ./root/ /
+COPY root/ /
+
+# ports and volumes
+EXPOSE 80 443
+VOLUME /config

Dockerfile.aarch64

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.14
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -7,30 +9,34 @@ ARG DISKOVER_RELEASE
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="alex-phillips"
 
+# environment settings
+ENV DISKOVERDIR=/config/diskover.conf.d/diskover/
+
 RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --virtual=build-dependencies \
     build-base \
-    gcc \
-    py3-pip \
-    python3-dev \
+    cargo \
     composer \
-    curl \
     git \
-    jq \
     nodejs \
-    npm && \
+    npm \
+    python3-dev && \
   echo "**** install runtime packages ****" && \
-  apk add --no-cache  \
+  apk add --no-cache \
     libldap \
     ncurses \
-    php7-curl \
-    php7-ldap \
-    php7-sqlite3 \
+    php81-curl \
+    php81-ldap \
+    php81-sqlite3 \
     py3-requests \
     py3-urllib3 \
     py3-xxhash \
     python3 && \
+  echo "**** configure php-fpm to pass env vars ****" && \
+  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php81/php-fpm.d/www.conf && \
+  grep -qxF 'clear_env = no' /etc/php81/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php81/php-fpm.d/www.conf && \
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php81/php-fpm.conf && \
   echo "**** install diskover ****" && \
   if [ -z ${DISKOVER_RELEASE+x} ]; then \
     DISKOVER_RELEASE=$(curl -sX GET "https://api.github.com/repos/diskoverdata/diskover-community/releases" \
@@ -43,17 +49,22 @@ RUN \
     /tmp/diskover.tar.gz -C \
     /app/ --strip-components=1 && \
   cd /app/diskover && \
-  pip3 install --no-cache-dir -r requirements.txt && \
-  sed -i 's@;clear_env = no@clear_env = no@' "/etc/php7/php-fpm.d/www.conf" && \
-  echo "**** overlay-fs workaround ****" && \
-  mv /app/diskover /app/diskover-tmp && \
-  mv /app/diskover-web /app/diskover-web-tmp && \
+  python3 -m ensurepip && \
+  pip3 install -U --no-cache-dir \
+    pip \
+    wheel && \
+  pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ -r requirements.txt && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \
   rm -rf \
     /tmp/* \
-    /root/.cache
+    $HOME/.cache \
+    $HOME/.cargo
 
 # add local files
-COPY ./root/ /
+COPY root/ /
+
+# ports and volumes
+EXPOSE 80 443
+VOLUME /config

Dockerfile.armhf

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.14
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -7,30 +9,34 @@ ARG DISKOVER_RELEASE
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="alex-phillips"
 
+# environment settings
+ENV DISKOVERDIR=/config/diskover.conf.d/diskover/
+
 RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --virtual=build-dependencies \
     build-base \
-    gcc \
-    py3-pip \
-    python3-dev \
+    cargo \
     composer \
-    curl \
     git \
-    jq \
     nodejs \
-    npm && \
+    npm \
+    python3-dev && \
   echo "**** install runtime packages ****" && \
-  apk add --no-cache  \
+  apk add --no-cache \
     libldap \
     ncurses \
-    php7-curl \
-    php7-ldap \
-    php7-sqlite3 \
+    php81-curl \
+    php81-ldap \
+    php81-sqlite3 \
     py3-requests \
     py3-urllib3 \
     py3-xxhash \
     python3 && \
+  echo "**** configure php-fpm to pass env vars ****" && \
+  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php81/php-fpm.d/www.conf && \
+  grep -qxF 'clear_env = no' /etc/php81/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php81/php-fpm.d/www.conf && \
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php81/php-fpm.conf && \
   echo "**** install diskover ****" && \
   if [ -z ${DISKOVER_RELEASE+x} ]; then \
     DISKOVER_RELEASE=$(curl -sX GET "https://api.github.com/repos/diskoverdata/diskover-community/releases" \
@@ -43,17 +49,22 @@ RUN \
     /tmp/diskover.tar.gz -C \
     /app/ --strip-components=1 && \
   cd /app/diskover && \
-  pip3 install --no-cache-dir -r requirements.txt && \
-  sed -i 's@;clear_env = no@clear_env = no@' "/etc/php7/php-fpm.d/www.conf" && \
-  echo "**** overlay-fs workaround ****" && \
-  mv /app/diskover /app/diskover-tmp && \
-  mv /app/diskover-web /app/diskover-web-tmp && \
+  python3 -m ensurepip && \
+  pip3 install -U --no-cache-dir \
+    pip \
+    wheel && \
+  pip3 install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.17/ -r requirements.txt && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \
   rm -rf \
     /tmp/* \
-    /root/.cache
+    $HOME/.cache \
+    $HOME/.cargo
 
 # add local files
-COPY ./root/ /
+COPY root/ /
+
+# ports and volumes
+EXPOSE 80 443
+VOLUME /config

Jenkinsfile

@@ -30,12 +30,12 @@ pipeline {
     DIST_IMAGE = 'alpine'
     MULTIARCH='true'
     CI='true'
-    CI_WEB='false'
-    CI_PORT=''
-    CI_SSL=''
+    CI_WEB='true'
+    CI_PORT='80'
+    CI_SSL='false'
     CI_DELAY='120'
     CI_DOCKERENV='TZ=US/Pacific'
-    CI_AUTH=''
+    CI_AUTH='user:password'
     CI_WEBPATH=''
   }
   stages {

README.md

@@ -271,6 +271,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **20.08.22:** - Rebasing to alpine 3.17 with php8.1. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)).
 * **25.02.22:** - Add php7-sqlite3 to support rc4 release.
 * **03.11.21:** - Added more support for potential config files.
 * **31.10.21:** - Added xpack.security variable to ElasticSearch; added instructions to edit Constants.php in diskover; corrected command needed to manually generate an index in diskover

jenkins-vars.yml

@@ -20,10 +20,10 @@ repo_vars:
   - DIST_IMAGE = 'alpine'
   - MULTIARCH='true'
   - CI='true'
-  - CI_WEB='false'
-  - CI_PORT=''
-  - CI_SSL=''
+  - CI_WEB='true'
+  - CI_PORT='80'
+  - CI_SSL='false'
   - CI_DELAY='120'
   - CI_DOCKERENV='TZ=US/Pacific'
-  - CI_AUTH=''
+  - CI_AUTH='user:password'
   - CI_WEBPATH=''

readme-vars.yml

@@ -94,6 +94,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "20.08.22:", desc: "Rebasing to alpine 3.17 with php8.1. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))." }
   - { date: "25.02.22:", desc: "Add php7-sqlite3 to support rc4 release." }
   - { date: "03.11.21:", desc: "Added more support for potential config files." }
   - { date: "31.10.21:", desc: "Added xpack.security variable to ElasticSearch; added instructions to edit Constants.php in diskover; corrected command needed to manually generate an index in diskover" }

root/defaults/crontabs/abc

@@ -0,0 +1,34 @@
+## Version 2023/01/23 - Changelog: https://github.com/linuxserver/docker-diskover/commits/master/root/defaults/nginx/site-confs/default.conf.sample
+
+server {
+    listen 80 default_server;
+    listen [::]:80 default_server;
+
+    listen 443 ssl http2 default_server;
+    listen [::]:443 ssl http2 default_server;
+
+    server_name _;
+
+    root /app/diskover-web/public;
+    index index.html index.htm index.php;
+
+    location / {
+        # enable for basic auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
+        try_files $uri $uri/ /index.php$is_args$args;
+    }
+
+    location ~ ^(.+\.php)(.*)$ {
+        fastcgi_split_path_info ^(.+\.php)(.*)$;
+        fastcgi_pass 127.0.0.1:9000;
+        fastcgi_index index.php;
+        include /etc/nginx/fastcgi_params;
+    }
+
+    # deny access to .htaccess/.htpasswd files
+    location ~ /\.ht {
+        deny all;
+    }
+}