Skip to content

Commit

Permalink
Merge pull request #11 from linuxserver/noble
Browse files Browse the repository at this point in the history
rebase to noble
  • Loading branch information
aptalca authored Aug 28, 2024
2 parents 6626625 + 33ece6c commit 814bd87
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 15 deletions.
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-kasmvnc:ubuntujammy
FROM ghcr.io/linuxserver/baseimage-kasmvnc:ubuntunoble

# set version label
ARG BUILD_DATE
Expand Down Expand Up @@ -51,6 +51,7 @@ RUN \
sed -i \
's/NLIMC/NLMC/g' \
/etc/xdg/openbox/rc.xml && \
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
echo "**** cleanup ****" && \
apt-get purge -y --autoremove \
build-essential \
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-kasmvnc:arm64v8-ubuntujammy
FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-ubuntunoble

# set version label
ARG BUILD_DATE
Expand Down Expand Up @@ -51,6 +51,7 @@ RUN \
sed -i \
's/NLIMC/NLMC/g' \
/etc/xdg/openbox/rc.xml && \
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
echo "**** cleanup ****" && \
apt-get purge -y --autoremove \
build-essential \
Expand Down
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,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
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ services:
- PGID=1000
- TZ=Etc/UTC
volumes:
- /path/to/config:/config
- /path/to/qdirstat/config:/config
- /path/to/data:/data
ports:
- 3000:3000
Expand All @@ -146,7 +146,7 @@ docker run -d \
-e TZ=Etc/UTC \
-p 3000:3000 \
-p 3001:3001 \
-v /path/to/config:/config \
-v /path/to/qdirstat/config:/config \
-v /path/to/data:/data \
--restart unless-stopped \
lscr.io/linuxserver/qdirstat:latest
Expand Down Expand Up @@ -327,6 +327,7 @@ 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:** - Rebase to KasmVNC base image. Deprecate armhf build as the new base does not support it.
* **16.12.22:** - Rebase to Jammy.
Expand Down
4 changes: 2 additions & 2 deletions jenkins-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,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: "QDirStat", url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=EYJXAVLGNRR5W" }
9 changes: 2 additions & 7 deletions readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,12 @@ available_architectures:
- { arch: "{{ arch_x86_64 }}", tag: "latest"}
- { arch: "{{ arch_arm64 }}", tag: "arm64v8-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 qdirstat settings and scans." }
- { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Users home directory in the container, stores qdirstat settings and scans." }
- { vol_path: "/data", vol_host_path: "/path/to/data", desc: "Data you want to analyze disk usage information of." }
param_usage_include_ports: true
param_ports:
Expand Down Expand Up @@ -88,6 +82,7 @@ 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: "Rebase to KasmVNC base image. Deprecate armhf build as the new base does not support it." }
- { date: "16.12.22:", desc: "Rebase to Jammy." }
Expand Down

0 comments on commit 814bd87

Please sign in to comment.