Rebase to 3.20, symlink robots.txt to /config

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
 
 ARG BUILD_DATE
 ARG VERSION
@@ -47,6 +47,7 @@ RUN \
   unzip -q \
     /tmp/grav.zip -d /tmp/grav && \
   mv /tmp/grav/grav-admin/* /app/www/public/ && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   rm -rf \
     /tmp/* \

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
 
 ARG BUILD_DATE
 ARG VERSION
@@ -47,6 +47,7 @@ RUN \
   unzip -q \
     /tmp/grav.zip -d /tmp/grav && \
   mv /tmp/grav/grav-admin/* /app/www/public/ && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   rm -rf \
     /tmp/* \

Jenkinsfile

@@ -34,7 +34,7 @@ pipeline {
     CI_PORT='80'
     CI_SSL='false'
     CI_DELAY='120'
-    CI_DOCKERENV='TZ=US/Pacific'
+    CI_DOCKERENV=''
     CI_AUTH=''
     CI_WEBPATH=''
   }

README.md

@@ -273,6 +273,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **19.06.24:** - Rebase to Alpine 3.20. Symlink robots.txt to /config. Existing users should update their nginx confs to avoid http2 deprecation warnings.
 * **06.03.24:** - Add brotli to nginx.
 * **06.03.24:** - Existing users should update: site-confs/default.conf - Cleanup default site conf.
 * **23.12.23:** - Rebase to Alpine 3.19 with php 8.3.

jenkins-vars.yml

@@ -6,7 +6,6 @@ external_type: github_stable
 release_type: stable
 release_tag: latest
 ls_branch: main
-build_armhf: false
 repo_vars:
   - EXT_GIT_BRANCH = 'master'
   - EXT_USER = 'getgrav'
@@ -25,10 +24,9 @@ repo_vars:
   - CI_PORT='80'
   - CI_SSL='false'
   - CI_DELAY='120'
-  - CI_DOCKERENV='TZ=US/Pacific'
+  - CI_DOCKERENV=''
   - CI_AUTH=''
   - CI_WEBPATH=''
 
 sponsor_links:
   - { name: "Grav", url: "https://opencollective.com/grav/donate" }
-

readme-vars.yml

@@ -18,10 +18,6 @@ available_architectures:
 common_param_env_vars_enabled: true
 param_container_name: "{{ project_name }}"
 
-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"}
-
 param_usage_include_ports: true
 param_ports:
   - { external_port: "80", internal_port: "80", port_desc: "Port for web frontend" }
@@ -39,6 +35,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "19.06.24:", desc: "Rebase to Alpine 3.20. Symlink robots.txt to /config. Existing users should update their nginx confs to avoid http2 deprecation warnings." }
   - { date: "06.03.24:", desc: "Add brotli to nginx." }
   - { date: "06.03.24:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf." }
   - { date: "23.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."}

root/defaults/nginx/site-confs/default.conf.sample

@@ -1,11 +1,8 @@
-## Version 2024/03/06 - Changelog: https://github.com/linuxserver/docker-grav/commits/main/root/defaults/nginx/site-confs/default.conf.sample
+## Version 2024/06/19 - Changelog: https://github.com/linuxserver/docker-grav/commits/main/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;
+    listen *:80 default_server;
+    listen *:443 ssl default_server;
 
     server_name _;
 

root/etc/s6-overlay/s6-rc.d/init-grav-config/run

@@ -1,6 +1,7 @@
 #!/usr/bin/with-contenv bash
 # shellcheck shell=bash
 
+# Symlink directories
 symlinks=(
     /app/www/public/backup
     /app/www/public/logs
@@ -21,6 +22,25 @@ for i in "${symlinks[@]}"; do
     fi
 done
 
+# Symlink files
+symlinks=(
+    /app/www/public/robots.txt
+)
+
+shopt -s globstar dotglob
+
+for i in "${symlinks[@]}"; do
+    if [[ -f /config/www/"$(basename "$i")" && ! -L "$i" ]]; then
+        rm -rf "$i"
+    fi
+    if [[ ! -f /config/www/"$(basename "$i")" && ! -L "$i" ]]; then
+        mv "$i" /config/www/
+    fi
+    if [[ -f /config/www/"$(basename "$i")" && ! -L "$i" ]]; then
+        ln -s /config/www/"$(basename "$i")" "$i"
+    fi
+done
+
 shopt -u globstar dotglob
 
 sed -i 's/enable_auto_updates_check: true/enable_auto_updates_check: false/' /config/www/user/plugins/admin/admin.yaml