Merge branch 'master' of https://github.com/jlesage/docker-nginx-proxy-manager into crowdsec_rework

Author: LePresidente

.github/workflows/build-image.yml

@@ -23,23 +23,15 @@ jobs:
 
     steps:
       - name: Free disk space
-        run: |
-          # Free disk space.
-          echo "::group::Before"
-          df -h /
-          echo "::endgroup::"
-          echo "::group::Removing unneeded softwares and files..."
-          for DIR in /usr/local/lib/android /usr/share/dotnet /opt/ghc
-          do
-            if [ -d "$DIR" ]; then
-                echo "Removing $DIR..."
-                sudo rm -r "$DIR"
-            fi
-          done
-          echo "::endgroup::"
-          echo "::group::After"
-          df -h /
-          echo "::endgroup::"
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: true
+          android: true
+          dotnet: true
+          haskell: true
+          large-packages: true
+          docker-images: true
+          swap-storage: false
 
       - name: Prepare
         id: prep

Dockerfile

@@ -8,12 +8,12 @@
 ARG DOCKER_IMAGE_VERSION=
 
 # Define software versions.
-ARG OPENRESTY_VERSION=1.19.9.1
-ARG CROWDSEC_OPENRESTY_BOUNCER_VERSION=1.0.2
-ARG NGINX_PROXY_MANAGER_VERSION=2.11.3
+ARG OPENRESTY_VERSION=1.27.1.1
+ARG NGINX_PROXY_MANAGER_VERSION=2.12.1
 ARG NGINX_HTTP_GEOIP2_MODULE_VERSION=3.3
 ARG LIBMAXMINDDB_VERSION=1.5.0
 ARG BCRYPT_TOOL_VERSION=1.1.2
+ARG CROWDSEC_OPENRESTY_BOUNCER_VERSION=1.0.2
 
 # Define software download URLs.
 ARG OPENRESTY_URL=https://openresty.org/download/openresty-${OPENRESTY_VERSION}.tar.gz
@@ -89,7 +89,7 @@ COPY src/cs-openresty-bouncer /build
 RUN /build/build.sh "$CROWDSEC_OPENRESTY_BOUNCER_URL"
 
 # Pull base image.
-FROM jlesage/baseimage:alpine-3.16-v3.6.2
+FROM jlesage/baseimage:alpine-3.16-v3.6.4
 
 ARG NGINX_PROXY_MANAGER_VERSION
 ARG DOCKER_IMAGE_VERSION

README.md

@@ -136,7 +136,7 @@ of this parameter has the format `<VARIABLE_NAME>=<VALUE>`.
 |`TZ`| [TimeZone](http://en.wikipedia.org/wiki/List_of_tz_database_time_zones) used by the container.  Timezone can also be set by mapping `/etc/localtime` between the host and the container. | `Etc/UTC` |
 |`KEEP_APP_RUNNING`| When set to `1`, the application will be automatically restarted when it crashes or terminates. | `0` |
 |`APP_NICENESS`| Priority at which the application should run.  A niceness value of -20 is the highest priority and 19 is the lowest priority.  The default niceness value is 0.  **NOTE**: A negative niceness (priority increase) requires additional permissions.  In this case, the container should be run with the docker option `--cap-add=SYS_NICE`. | `0` |
-|`INSTALL_PACKAGES`| Space-separated list of packages to install during the startup of the container.  List of available packages can be found at https://mirrors.alpinelinux.org.  **ATTENTION**: Container functionality can be affected when installing a package that overrides existing container files (e.g. binaries). | (no value) |
+|`INSTALL_PACKAGES`| Space-separated list of packages to install during the startup of the container.  List of available packages can be found at https://pkgs.alpinelinux.org.  **ATTENTION**: Container functionality can be affected when installing a package that overrides existing container files (e.g. binaries). | (no value) |
 |`PACKAGES_MIRROR`| Mirror of the repository to use when installing packages. List of mirrors is available at https://mirrors.alpinelinux.org. | (no value) |
 |`CONTAINER_DEBUG`| Set to `1` to enable debug logging. | `0` |
 |`DISABLE_IPV6`| When set to `1`, IPv6 support is disabled.  This is needed when IPv6 is not enabled/supported on the host. | `0` |

appdefs.yml

@@ -98,6 +98,13 @@ app:
             - `CONTAINER_NAME` is the name of the running container.
             - `USER_EMAIL` is the email of the address to reset the password.
   changelog:
+    - version: 24.12.1
+      date: 2024-12-07
+      changes:
+        - 'Updated Nginx Proxy Manager to version 2.12.1.'
+        - 'Updated OpenResty to version 1.27.1.1.'
+        - 'Updated baseimage to version 3.6.4, which brings the following changes:'
+        - '2:Rebuild against latest distro images to get security fixes.'
     - version: 24.07.1
       date: 2024-07-05
       changes: