diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 16 | ||||
| -rw-r--r-- | docker/patches/live-build/0001-save-package-info.patch | 30 |
2 files changed, 29 insertions, 17 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 498dd69a..4f2afe03 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -103,6 +103,7 @@ RUN apt-get update && apt-get install -y \ python3-flake8 \ python3-autopep8 \ python3-tomli \ + python3-tomli-w \ yq \ debootstrap \ live-build \ @@ -154,7 +155,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#fc327ecd76 -y + opam pin add vyos1x-config https://github.com/vyos/vyos1x-config.git#d7260e772e39bc6a3a2d76d629567e03bbad16b5 -y # Packages needed for libvyosconfig RUN apt-get update && apt-get install -y \ @@ -165,7 +166,7 @@ RUN apt-get update && apt-get install -y \ # Build libvyosconfig RUN eval $(opam env --root=/opt/opam --set-root) && \ git clone https://github.com/vyos/libvyosconfig.git /tmp/libvyosconfig && \ - cd /tmp/libvyosconfig && git checkout c6141d97 && \ + cd /tmp/libvyosconfig && git checkout 9e4f6c1494fcff64ad22503b704dbdd43347b0a6 && \ dpkg-buildpackage -uc -us -tc -b && \ dpkg -i /tmp/libvyosconfig0_*_$(dpkg-architecture -qDEB_HOST_ARCH).deb @@ -270,8 +271,8 @@ RUN pip install --break-system-packages \ quilt \ whois -# Go required for validators and vyos-xe-guest-utilities -RUN GO_VERSION_INSTALL="1.21.3" ; \ +# Go required for telegraf and prometheus exporters build +RUN GO_VERSION_INSTALL="1.23.2" ; \ wget -O /tmp/go${GO_VERSION_INSTALL}.linux-amd64.tar.gz https://go.dev/dl/go${GO_VERSION_INSTALL}.linux-$(dpkg-architecture -qDEB_HOST_ARCH).tar.gz ; \ tar -C /opt -xzf /tmp/go*.tar.gz && \ rm /tmp/go*.tar.gz @@ -376,6 +377,13 @@ RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \ asciidoc-base +# Extra packages +RUN apt-get update +# For owamp +RUN apt-get install -y dh-apparmor dh-exec libcap-dev +# For vyos-xe-guest-utilities +RUN apt-get install -y golang gawk + # Allow password-less 'sudo' for all users in group 'sudo' RUN sed "s/^%sudo.*/%sudo\tALL=(ALL) NOPASSWD:ALL/g" -i /etc/sudoers && \ echo "vyos_bld\tALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers && \ diff --git a/docker/patches/live-build/0001-save-package-info.patch b/docker/patches/live-build/0001-save-package-info.patch index abb4308d..3ce22fe1 100644 --- a/docker/patches/live-build/0001-save-package-info.patch +++ b/docker/patches/live-build/0001-save-package-info.patch @@ -1,33 +1,36 @@ -From 3ddf0e979c352f2917be6a949fb8dd37b5c9f2b7 Mon Sep 17 00:00:00 2001 +From 9dacc8bf99310b2216be24a42f2c0475080cf039 Mon Sep 17 00:00:00 2001 From: khramshinr <khramshinr@gmail.com> -Date: Wed, 28 Aug 2024 14:38:15 +0600 +Date: Thu, 24 Oct 2024 14:22:57 +0600 Subject: [PATCH] T6684: new Debian package repo snapshot logic -save information about all installed packages and teir source repo, including temporary packages +Save information about all installed packages and teir source repo, including temporary packages +Added functionality to store version information for temporarily installed packages. --- - functions/packages.sh | 7 +++++++ + functions/packages.sh | 9 +++++++++ scripts/build/chroot | 6 ++++++ scripts/build/clean | 2 +- - 3 files changed, 14 insertions(+), 1 deletion(-) + 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/functions/packages.sh b/functions/packages.sh -index 9e25df5f3..4d1fa695e 100755 +index 2481edc25..a6c2c1e8d 100755 --- a/functions/packages.sh +++ b/functions/packages.sh -@@ -60,6 +60,13 @@ Install_packages () +@@ -60,6 +60,15 @@ Install_packages () Chroot chroot "aptitude install --without-recommends ${APTITUDE_OPTIONS} ${_LB_PACKAGES}" ;; esac + + # save information about all temporary installed packages and source repos + for PACKAGE in ${_LB_PACKAGES}; do -+ Chroot chroot "apt-cache policy ${PACKAGE}" | sed -n '/\*\*\*/,$p' | grep -P 'http:|https:' -m 1 | awk -v pkg="${PACKAGE}" '{print $2" "$3" "pkg}' >> chroot.packages.all.info ++ INSTALLED_VERSION=$(Chroot chroot "apt-cache policy ${PACKAGE}" | grep 'Installed:' | awk '{print $2}') ++ Chroot chroot "apt-cache policy ${PACKAGE}" | sed -n '/\*\*\*/,$p' | grep -P 'http:|https:' -m 1 | \ ++ awk -v pkg="${PACKAGE}" -v version="${INSTALLED_VERSION}" '{print $2" "$3" "pkg" "version}' >> chroot.packages.all.info + + done + unset _LB_PACKAGES # Can clear this now } - + diff --git a/scripts/build/chroot b/scripts/build/chroot index a0aa10be0..700762e78 100755 --- a/scripts/build/chroot @@ -35,7 +38,7 @@ index a0aa10be0..700762e78 100755 @@ -48,6 +48,12 @@ for _PASS in install live; do fi done - + +# save information about all installed packages and source repos +Chroot chroot "dpkg-query -W" | while read PACKAGE; do + Chroot chroot "apt-cache policy ${PACKAGE}" | sed -n '/\*\*\*/,$p' | grep -P 'http:|https:' -m 1 | awk -v pkg="${PACKAGE}" '{print $2" "$3" "pkg}' >> chroot.packages.all.info @@ -50,11 +53,12 @@ index 6549fc635..4376d7525 100755 --- a/scripts/build/clean +++ b/scripts/build/clean @@ -159,7 +159,7 @@ if [ "${RM_CHROOT}" = "true" ]; then - + rm -rf chroot chroot.tmp - + - rm -f chroot.packages.live chroot.packages.install + rm -f chroot.packages.live chroot.packages.install chroot.packages.all.info rm -f chroot.files + + rm -f "$(Installed_tmp_packages_file)" - rm -f "$(Installed_tmp_packages_file)"
\ No newline at end of file |