Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase to 3.20 (master) #68

Merged
merged 1 commit into from
Jul 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

FROM ghcr.io/linuxserver/baseimage-alpine:3.19
FROM ghcr.io/linuxserver/baseimage-alpine:3.20

# set version label
ARG BUILD_DATE
Expand Down Expand Up @@ -30,6 +30,7 @@ RUN \
/tmp/webapp.tar.gz -C \
/app/ --strip-components=1 && \
npm install --prefix /app && \
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
echo "**** cleanup ****" && \
apk del --purge \
build-dependencies && \
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile.aarch64
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1

FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20

# set version label
ARG BUILD_DATE
Expand Down Expand Up @@ -30,6 +30,7 @@ RUN \
/tmp/webapp.tar.gz -C \
/app/ --strip-components=1 && \
npm install --prefix /app && \
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
echo "**** cleanup ****" && \
apk del --purge \
build-dependencies && \
Expand Down
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ pipeline {
CI_PORT='3000'
CI_SSL='false'
CI_DELAY='120'
CI_DOCKERENV='TZ=US/Pacific'
CI_AUTH='user:password'
CI_DOCKERENV=''
CI_AUTH=''
CI_WEBPATH=''
}
stages {
Expand Down
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ services:
- NGINX_PORT=80 #optional
- WEB_APP_PORT=3000 #optional
volumes:
- /path/to/config:/config
- /path/to/netbootxyz/config:/config
- /path/to/assets:/assets #optional
ports:
- 3000:3000
Expand All @@ -200,7 +200,7 @@ docker run -d \
-p 3000:3000 \
-p 69:69/udp \
-p 8080:80 `#optional` \
-v /path/to/config:/config \
-v /path/to/netbootxyz/config:/config \
-v /path/to/assets:/assets `#optional` \
--restart unless-stopped \
lscr.io/linuxserver/netbootxyz:latest
Expand All @@ -220,7 +220,7 @@ Containers are configured using parameters passed at runtime (such as those abov
| `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). |
| `-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/) |
| `-e SUBFOLDER=/` | Specify a subfolder if running this behind a reverse proxy (IE /proxy/) |
| `-e NGINX_PORT=80` | Specify a different internal port for the asset server |
| `-e WEB_APP_PORT=3000` | Specify a different internal port for the configuration UI |
| `-v /config` | Storage for boot menu files and web application config |
Expand Down Expand Up @@ -387,6 +387,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

## Versions

* **30.06.24:** - Rebase to Alpine 3.20.
* **24.02.24:** - Add new port settings for the webserver and app.
* **08.12.23:** - Rebase to Alpine 3.19.
* **17.11.23:** - Rebase to Alpine 3.18.
Expand Down
4 changes: 2 additions & 2 deletions jenkins-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ repo_vars:
- CI_PORT='3000'
- CI_SSL='false'
- CI_DELAY='120'
- CI_DOCKERENV='TZ=US/Pacific'
- CI_AUTH='user:password'
- CI_DOCKERENV=''
- CI_AUTH=''
- CI_WEBPATH=''
sponsor_links:
- { name: "netboot.xyz", url: "https://opencollective.com/netbootxyz/donate" }
6 changes: 3 additions & 3 deletions readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,17 @@ common_param_env_vars_enabled: true
param_container_name: "{{ project_name }}"
param_usage_include_vols: true
param_volumes:
- {vol_path: "/config", vol_host_path: "/path/to/config", desc: "Storage for boot menu files and web application config"}
- {vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Storage for boot menu files and web application config"}
param_usage_include_ports: true
param_ports:
- {external_port: "3000", internal_port: "3000", port_desc: "Web configuration interface."}
- {external_port: "69", internal_port: "69/udp", port_desc: "TFTP Port."}
param_usage_include_env: false
# optional env variables
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/)"}
- {env_var: "SUBFOLDER", env_value: "/", desc: "Specify a subfolder if running this behind a reverse proxy (IE /proxy/)"}
- {env_var: "NGINX_PORT", env_value: "80", desc: "Specify a different internal port for the asset server"}
- {env_var: "WEB_APP_PORT", env_value: "3000", desc: "Specify a different internal port for the configuration UI"}
opt_param_usage_include_ports: true
Expand Down Expand Up @@ -130,6 +129,7 @@ app_setup_block: |

# changelog
changelogs:
- {date: "30.06.24:", desc: "Rebase to Alpine 3.20."}
- {date: "24.02.24:", desc: "Add new port settings for the webserver and app."}
- {date: "08.12.23:", desc: "Rebase to Alpine 3.19."}
- {date: "17.11.23:", desc: "Rebase to Alpine 3.18."}
Expand Down