rebase to noble

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:ubuntujammy
+FROM ghcr.io/linuxserver/baseimage-kasmvnc:ubuntunoble
 
 # set version label
 ARG BUILD_DATE
@@ -17,8 +17,11 @@ RUN \
   curl -o \
     /kclient/public/icon.png \
     https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/mullvad-browser-logo.png && \
-  echo "**** install packages ****" && \
+  echo "**** install build dependencies ****" && \
   apt-get update && \
+  apt-get install -y --no-install-recommends \
+    make && \
+  echo "**** install runtime packages ****" && \
   apt-get install -y --no-install-recommends \
     fontconfig \
     gnupg \
@@ -28,9 +31,22 @@ RUN \
     libdbus-glib-1-2 \
     libgtk-3-0 \
     net-tools \
-    openresolv \
     wireguard \
     xz-utils && \
+  echo "**** install openresolv ****" && \
+  OPENRESOLV_VERSION=$(curl -sX GET "https://api.github.com/repos/NetworkConfiguration/openresolv/releases/latest" \
+    | jq -r '.tag_name') && \
+  curl -s -o \
+    /tmp/openresolv.tar.gz -L \
+    "/~https://github.com/NetworkConfiguration/openresolv/archive/refs/tags/${OPENRESOLV_VERSION}.tar.gz" && \
+  mkdir -p /tmp/openresolv && \
+  tar xf \
+    /tmp/openresolv.tar.gz -C \
+    /tmp/openresolv --strip-components=1 && \
+  cd /tmp/openresolv && \
+  ./configure && \
+  make && \
+  make install && \
   echo "**** install mullvad browser ****" && \
   mkdir -p /app && \
   if [ -z ${MULLVAD_VERSION+x} ]; then \
@@ -57,7 +73,10 @@ RUN \
   chmod 777 /app/Data && \
   find /app -perm 700 -exec chmod 755 {} + && \
   find /app -perm 600 -exec chmod 644 {} + && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   echo "**** cleanup ****" && \
+  apt-get purge -y --autoremove \
+    make && \
   rm -rf \
     /tmp/* \
     /var/lib/apt/lists/* \

Jenkinsfile

@@ -33,8 +33,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 {

README.md

@@ -152,7 +152,7 @@ services:
       - TZ=Etc/UTC
       - LOCAL_NET=192.168.0.0/16 #optional
     volumes:
-      - /path/to/config:/config
+      - /path/to/mullvad-browser/config:/config
     ports:
       - 3000:3000
       - 3001:3001
@@ -173,7 +173,7 @@ docker run -d \
   -e LOCAL_NET=192.168.0.0/16 `#optional` \
   -p 3000:3000 \
   -p 3001:3001 \
-  -v /path/to/config:/config \
+  -v /path/to/mullvad-browser/config:/config \
   --shm-size="1gb" \
   --restart unless-stopped \
   lscr.io/linuxserver/mullvad-browser:latest
@@ -360,5 +360,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **28.08.24:** - Rebase to noble.
 * **10.02.24:** - Update Readme with new env vars and ingest proper PWA icon.
 * **03.04.23:** - Initial release.

jenkins-vars.yml

@@ -23,6 +23,6 @@ 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 = ''

readme-vars.yml

@@ -12,18 +12,12 @@ project_blurb_optional_extras_enabled: false
 available_architectures:
   - { arch: "{{ arch_x86_64 }}", tag: "latest"}
 
-# development version
-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: "Mullvad Browser GUI." }
@@ -116,5 +110,6 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "28.08.24:", desc: "Rebase to noble." }
   - { date: "10.02.24:", desc: "Update Readme with new env vars and ingest proper PWA icon." }
   - { date: "03.04.23:", desc: "Initial release." }