From 37a10cf2e4a19e45e85d1906d149c14c0655c6e4 Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Wed, 21 Aug 2024 13:13:42 -0400 Subject: [PATCH 1/2] Rebase to noble, update repos --- Dockerfile | 11 +++++------ Dockerfile.aarch64 | 11 +++++------ Jenkinsfile | 2 +- README.md | 1 + jenkins-vars.yml | 2 +- readme-vars.yml | 25 +------------------------ 6 files changed, 14 insertions(+), 38 deletions(-) diff --git a/Dockerfile b/Dockerfile index 819c9bf..0794063 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy +FROM ghcr.io/linuxserver/baseimage-ubuntu:noble # set version label ARG BUILD_DATE @@ -20,12 +20,11 @@ ENV NVIDIA_DRIVER_CAPABILITIES="compute,graphics,video,utility" \ # Container setup RUN \ echo "**** install packages ****" && \ - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \ - echo "deb [arch=amd64] https://download.docker.com/linux/ubuntu jammy stable" > \ - /etc/apt/sources.list.d/docker.list && \ + curl -fsSL https://download.docker.com/linux/ubuntu/gpg | tee /usr/share/keyrings/docker.asc >/dev/null && \ + echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker.asc] https://download.docker.com/linux/ubuntu noble stable" > /etc/apt/sources.list.d/docker.list && \ curl -fsSL https://nvidia.github.io/libnvidia-container/gpgkey | \ gpg --dearmor -o /usr/share/keyrings/nvidia-container-toolkit-keyring.gpg && \ - curl -s -L https://nvidia.github.io/libnvidia-container/ubuntu22.04/libnvidia-container.list | \ + curl -s -L https://nvidia.github.io/libnvidia-container/stable/deb/nvidia-container-toolkit.list | \ sed 's#deb https://#deb [signed-by=/usr/share/keyrings/nvidia-container-toolkit-keyring.gpg] https://#g' | \ tee /etc/apt/sources.list.d/nvidia-container-toolkit.list && \ curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \ @@ -44,7 +43,7 @@ RUN \ lsof \ make \ nodejs \ - nvidia-docker2 \ + nvidia-container-toolkit \ openssl \ pigz \ python3 \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 2204b4a..7d51e37 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-noble # set version label ARG BUILD_DATE @@ -20,12 +20,11 @@ ENV NVIDIA_DRIVER_CAPABILITIES="compute,graphics,video,utility" \ # Container setup RUN \ echo "**** install packages ****" && \ - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \ - echo "deb [arch=arm64] https://download.docker.com/linux/ubuntu jammy stable" > \ - /etc/apt/sources.list.d/docker.list && \ + curl -fsSL https://download.docker.com/linux/ubuntu/gpg | tee /usr/share/keyrings/docker.asc >/dev/null && \ + echo "deb [arch=arm64 signed-by=/usr/share/keyrings/docker.asc] https://download.docker.com/linux/ubuntu noble stable" > /etc/apt/sources.list.d/docker.list && \ curl -fsSL https://nvidia.github.io/libnvidia-container/gpgkey | \ gpg --dearmor -o /usr/share/keyrings/nvidia-container-toolkit-keyring.gpg && \ - curl -s -L https://nvidia.github.io/libnvidia-container/ubuntu22.04/libnvidia-container.list | \ + curl -s -L https://nvidia.github.io/libnvidia-container/stable/deb/nvidia-container-toolkit.list | \ sed 's#deb https://#deb [signed-by=/usr/share/keyrings/nvidia-container-toolkit-keyring.gpg] https://#g' | \ tee /etc/apt/sources.list.d/nvidia-container-toolkit.list && \ curl -fsSL https://deb.nodesource.com/setup_18.x | bash - && \ @@ -44,7 +43,7 @@ RUN \ lsof \ make \ nodejs \ - nvidia-docker2 \ + nvidia-container-toolkit \ openssl \ pigz \ python3 \ diff --git a/Jenkinsfile b/Jenkinsfile index fedab04..01e9e18 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,7 +37,7 @@ pipeline { CI_SSL='true' CI_DELAY='120' CI_DOCKERENV='TEST=true' - CI_AUTH='user:password' + CI_AUTH='' CI_WEBPATH='' } stages { diff --git a/README.md b/README.md index d94cd0c..400538e 100644 --- a/README.md +++ b/README.md @@ -313,6 +313,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **21.08.24:** - Rebase to Noble. * **16.02.24:** - Update base image for 1.15.0 release. * **22.08.23:** - Update base image for 1.14.0 release. * **07.04.23:** - Add mod layer for ingesting LSIO images for 1.13.0 release. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 3bd4833..6886c31 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -26,5 +26,5 @@ repo_vars: - CI_SSL='true' - CI_DELAY='120' - CI_DOCKERENV='TEST=true' - - CI_AUTH='user:password' + - CI_AUTH='' - CI_WEBPATH='' diff --git a/readme-vars.yml b/readme-vars.yml index d995bf6..eed5c4d 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -9,9 +9,6 @@ project_blurb: | project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}" -project_blurb_optional_extras_enabled: false -project_blurb_optional_extras: [] - # supported architectures available_architectures: - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} @@ -27,21 +24,14 @@ development_versions_items: common_param_env_vars_enabled: false param_container_name: "{{ project_name }}" -param_usage_include_net: false - param_usage_include_env: true param_env_vars: - { env_var: "KASM_PORT", env_value: "443", desc: "Specify the port you bind to the outside for Kasm Workspaces." } - - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." } - param_usage_include_vols: true param_volumes: - { vol_path: "/opt", vol_host_path: "/path/to/data", desc: "Docker and installation storage." } -param_device_map: false -param_devices: [] - param_usage_include_ports: true param_ports: - { external_port: "3000", internal_port: "3000", port_desc: "Kasm Installation wizard. (https)" } @@ -60,20 +50,6 @@ opt_param_volumes: - { vol_path: "/dev/input", vol_host_path: "/dev/input", desc: "Optional for gamepad support." } - { vol_path: "/run/udev/data", vol_host_path: "/run/udev/data", desc: "Optional for gamepad support." } -opt_param_usage_include_ports: false -opt_param_ports: [] - -opt_param_device_map: false -opt_param_devices: [] - -cap_add_param: false -cap_add_param_vars: [] - -opt_cap_add_param: false -opt_cap_add_param_vars: [] -optional_block_1: false -optional_block_1_items: "" - unraid_template: false privileged: true @@ -112,6 +88,7 @@ app_setup_block: | # changelog changelogs: + - { date: "21.08.24:", desc: "Rebase to Noble." } - { date: "16.02.24:", desc: "Update base image for 1.15.0 release." } - { date: "22.08.23:", desc: "Update base image for 1.14.0 release." } - { date: "07.04.23:", desc: "Add mod layer for ingesting LSIO images for 1.13.0 release." } From 2673ac4a0a1dc4bf38adba1926f1061e3799f6a1 Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Wed, 21 Aug 2024 13:19:40 -0400 Subject: [PATCH 2/2] add version to image --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + 2 files changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 0794063..718d556 100644 --- a/Dockerfile +++ b/Dockerfile @@ -107,6 +107,7 @@ RUN \ cp \ /kasm_release/conf/database/seed_data/default_images_a* \ /wizard/ && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ apt-get remove -y g++ gcc make && \ apt-get -y autoremove && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 7d51e37..a7f214d 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -107,6 +107,7 @@ RUN \ cp \ /kasm_release/conf/database/seed_data/default_images_a* \ /wizard/ && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ apt-get remove -y g++ gcc make && \ apt-get -y autoremove && \