diff options
| -rw-r--r-- | Jenkinsfile | 3 | ||||
| -rw-r--r-- | data/defaults.toml | 2 | ||||
| -rwxr-xr-x | data/live-build-config/hooks/live/80-delete-docs.chroot | 5 | ||||
| -rw-r--r-- | docker/Dockerfile | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/Jenkinsfile b/Jenkinsfile index 7d27f0a6..9384d48e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -53,9 +53,6 @@ pipeline { reuseNode true } } - triggers { - cron('H 3 * * *') - } parameters { string(name: 'BUILD_BY', defaultValue: 'autobuild@vyos.net', description: 'Builder identifier (e.g. jrandomhacker@example.net)') string(name: 'BUILD_VERSION', defaultValue: env.BASE_VERSION + 'ISO8601-TIMESTAMP', description: 'Version number (release builds only)') diff --git a/data/defaults.toml b/data/defaults.toml index abef4773..1489c8a2 100644 --- a/data/defaults.toml +++ b/data/defaults.toml @@ -14,7 +14,7 @@ vyos_mirror = "http://dev.packages.vyos.net/repositories/current" vyos_branch = "current" release_train = "current" -kernel_version = "6.1.46" +kernel_version = "6.1.47" bootloaders = "syslinux,grub-efi" website_url = "https://vyos.io" diff --git a/data/live-build-config/hooks/live/80-delete-docs.chroot b/data/live-build-config/hooks/live/80-delete-docs.chroot index ce18bc8f..33a6bf74 100755 --- a/data/live-build-config/hooks/live/80-delete-docs.chroot +++ b/data/live-build-config/hooks/live/80-delete-docs.chroot @@ -4,3 +4,8 @@ # Copyright/licenses files are ignored for deletion shopt -s extglob rm -rf /usr/share/doc/*/!(copyright*|README*) /usr/share/doc-base + +# We also do not need any manpages on the system since man-binary is missing. +# This also frees some space. +rm -rf /usr/share/man + diff --git a/docker/Dockerfile b/docker/Dockerfile index 87c5d231..a1d22b26 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -138,7 +138,7 @@ RUN eval $(opam env --root=/opt/opam --set-root) && opam install -y \ # Build VyConf which is required to build libvyosconfig RUN eval $(opam env --root=/opt/opam --set-root) && \ - opam pin add vyos1x-config https://github.com/vyos/vyos1x-config.git#2037d3f9 -y + opam pin add vyos1x-config https://github.com/vyos/vyos1x-config.git#f11f0148 -y # Packages needed for libvyosconfig RUN apt-get update && apt-get install -y \ |