From 05dd032d438727d84fa9c1568c8fe0ff97e5acf1 Mon Sep 17 00:00:00 2001 From: thelamer Date: Thu, 29 Apr 2021 13:48:59 -0700 Subject: [PATCH] rebasing to alpine 3.13 and adding new env variable --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- Dockerfile.armhf | 2 +- README.md | 4 ++++ readme-vars.yml | 2 ++ 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 821d28e..be27e4e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:3.12 +FROM ghcr.io/linuxserver/baseimage-alpine:3.13 # set version label ARG BUILD_DATE diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 27c5ab6..b1212a5 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.12 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.13 # set version label ARG BUILD_DATE diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 9fe8e4b..9a1a4c7 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.12 +FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.13 # set version label ARG BUILD_DATE diff --git a/README.md b/README.md index eb776e1..adab064 100644 --- a/README.md +++ b/README.md @@ -185,6 +185,7 @@ services: - PGID=1000 - MENU_VERSION=1.9.9 #optional - PORT_RANGE=30000:30010 #optional + - SUBFOLDER=/ #optional volumes: - /path/to/config:/config - /path/to/assets:/assets #optional @@ -204,6 +205,7 @@ docker run -d \ -e PGID=1000 \ -e MENU_VERSION=1.9.9 `#optional` \ -e PORT_RANGE=30000:30010 `#optional` \ + -e SUBFOLDER=/ `#optional` \ -p 3000:3000 \ -p 69:69/udp \ -p 8080:80 `#optional` \ @@ -226,6 +228,7 @@ Container images are configured using parameters passed at runtime (such as thos | `-e PGID=1000` | for GroupID - see below for explanation | | `-e MENU_VERSION=1.9.9` | Specify a specific version of boot files you want to use from NETBOOT.XYZ (unset pulls latest) | | `-e PORT_RANGE=30000:30010` | Specify the port range tftp will use for data transfers [(see Wikipedia)](https://en.wikipedia.org/wiki/Trivial_File_Transfer_Protocol#Details) | +| `-e SUBFOLDER=/` | Specify a sobfolder if running this behind a reverse proxy (IE /proxy/) | | `-v /config` | Storage for boot menu files and web application config | | `-v /assets` | Storage for NETBOOT.XYZ bootable assets (live CDs and other files) | @@ -338,6 +341,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **29.04.21:** - Rebasing to alpine 3.13, add SUBFOLDER env variable. * **01.06.20:** - Rebasing to alpine 3.12. * **19.12.19:** - Rebasing to alpine 3.11. * **13.12.19:** - Swapping latest tag over to webapp stack for management. diff --git a/readme-vars.yml b/readme-vars.yml index fbb59c8..d65996e 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -36,6 +36,7 @@ opt_param_usage_include_env: true opt_param_env_vars: - { env_var: "MENU_VERSION", env_value: "1.9.9", desc: "Specify a specific version of boot files you want to use from NETBOOT.XYZ (unset pulls latest)"} - { env_var: "PORT_RANGE", env_value: "30000:30010", desc: "Specify the port range tftp will use for data transfers [(see Wikipedia)](https://en.wikipedia.org/wiki/Trivial_File_Transfer_Protocol#Details)"} + - { env_var: "SUBFOLDER", env_value: "/", desc: "Specify a sobfolder if running this behind a reverse proxy (IE /proxy/)"} opt_param_usage_include_ports: true opt_param_ports: - { external_port: "8080", internal_port: "80", port_desc: "NGINX server for hosting assets." } @@ -145,6 +146,7 @@ app_setup_block: | # changelog changelogs: + - { date: "29.04.21:", desc: "Rebasing to alpine 3.13, add SUBFOLDER env variable." } - { date: "01.06.20:", desc: "Rebasing to alpine 3.12." } - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." } - { date: "13.12.19:", desc: "Swapping latest tag over to webapp stack for management." }