Merge pull request #12 from linuxserver/noble

rebase to noble

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:ubuntujammy
+FROM ghcr.io/linuxserver/baseimage-kasmvnc:ubuntunoble
 
 # set version label
 ARG BUILD_DATE
@@ -43,6 +43,7 @@ RUN \
   ln -s \
     /blender/blender \
     /usr/bin/blender && \
+  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-kasmvnc:arm64v8-ubuntujammy
+FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-ubuntunoble
 
 # set version label
 ARG BUILD_DATE
@@ -21,6 +21,7 @@ RUN \
   apt-get update && \
   apt-get install --no-install-recommends -y \
     blender && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
   rm -rf \
     /tmp/* \

Jenkinsfile

@@ -32,9 +32,9 @@ pipeline {
     CI_WEB = 'true'
     CI_PORT = '3000'
     CI_SSL = 'false'
-    CI_DELAY = '120'
-    CI_DOCKERENV = 'TZ=US/Pacific'
-    CI_AUTH = 'user:password'
+    CI_DOCKER_LOGS_TIMEOUT = '240'
+    CI_DOCKERENV = ''
+    CI_AUTH = ''
     CI_WEBPATH = ''
   }
   stages {
@@ -728,7 +728,7 @@ pipeline {
                 --shm-size=1gb \
                 -v /var/run/docker.sock:/var/run/docker.sock \
                 -e IMAGE=\"${IMAGE}\" \
-                -e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \
+                -e DOCKER_LOGS_TIMEOUT=\"${CI_DOCKER_LOGS_TIMEOUT}\" \
                 -e TAGS=\"${CI_TAGS}\" \
                 -e META_TAG=\"${META_TAG}\" \
                 -e PORT=\"${CI_PORT}\" \

README.md

@@ -156,7 +156,7 @@ services:
       - TZ=Etc/UTC
       - SUBFOLDER=/ #optional
     volumes:
-      - /path/to/config:/config
+      - /path/to/blender/config:/config
     ports:
       - 3000:3000
       - 3001:3001
@@ -175,7 +175,7 @@ docker run -d \
   -e SUBFOLDER=/ `#optional` \
   -p 3000:3000 \
   -p 3001:3001 \
-  -v /path/to/config:/config \
+  -v /path/to/blender/config:/config \
   --restart unless-stopped \
   lscr.io/linuxserver/blender:latest
 ```
@@ -356,6 +356,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **19.08.24:** - Rebase to noble.
 * **10.02.24:** - Update Readme with new env vars and ingest proper PWA icon.
 * **18.03.23:** - Rebase to KasmVNC base image.
 * **13.12.22:** - Rebase to Jammy, migrate to s6v3.

jenkins-vars.yml

@@ -22,7 +22,7 @@ repo_vars:
   - CI_WEB = 'true'
   - CI_PORT = '3000'
   - CI_SSL = 'false'
-  - CI_DELAY = '120'
-  - CI_DOCKERENV = 'TZ=US/Pacific'
-  - CI_AUTH = 'user:password'
+  - CI_DOCKER_LOGS_TIMEOUT = '240'
+  - CI_DOCKERENV = ''
+  - CI_AUTH = ''
   - CI_WEBPATH = ''

readme-vars.yml

@@ -19,12 +19,9 @@ development_versions: false
 # container parameters
 common_param_env_vars_enabled: true
 param_container_name: "{{ project_name }}"
-param_usage_include_env: true
-param_env_vars:
-  - { 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: "/config", vol_host_path: "/path/to/config", desc: "Users home directory in the container, stores local files and settings" }
+  - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Users home directory in the container, stores local files and settings" }
 param_usage_include_ports: true
 param_ports:
   - { external_port: "3000", internal_port: "3000", port_desc: "Blender desktop gui" }
@@ -120,6 +117,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "19.08.24:", desc: "Rebase to noble." }
   - { date: "10.02.24:", desc: "Update Readme with new env vars and ingest proper PWA icon." }
   - { date: "18.03.23:", desc: "Rebase to KasmVNC base image." }
   - { date: "13.12.22:", desc: "Rebase to Jammy, migrate to s6v3." }