diff --git a/Dockerfile b/Dockerfile index 9077b7a..d0bc5d5 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 2ddc307..3c5b789 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 2563a1d..ac6a91d 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 _;