From b65ee74f8b963b669e6badce09448c5ad5bc62c4 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 30 Dec 2022 22:20:10 +0100
Subject: Docker: remove unnecessary sudo calls

---
 docker/Dockerfile | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index a6126904..b45572d2 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -172,7 +172,7 @@ RUN wget https://salsa.debian.org/jestabro-guest/live-build/commit/63425b3e4f7ad
     patch -p1 < /tmp/63425b3e4f7ad3712ced4c9a3584ef9851c0355a.patch && \
     dch -n "Applying fix for missing archive keys" && \
     dpkg-buildpackage -us -uc && \
-    sudo dpkg -i ../live-build*.deb
+    dpkg -i ../live-build*.deb
 
 #
 # live-build: building in docker fails with mounting /proc | /sys
@@ -188,7 +188,7 @@ RUN wget https://salsa.debian.org/klausenbusk-guest/debootstrap/commit/a9a603b17
     patch -p1 < /tmp/a9a603b17cadbf52cb98cde0843dc9f23a08b0da.patch && \
     dch -n "Applying fix for docker image compile" && \
     dpkg-buildpackage -us -uc && \
-    sudo dpkg -i ../debootstrap*.deb
+    dpkg -i ../debootstrap*.deb
 
 #
 # Install Packer
@@ -360,13 +360,10 @@ RUN if dpkg-architecture -ii386 || dpkg-architecture -iamd64; then \
 
 # Go required for validators and vyos-xe-guest-utilities
 RUN GO_VERSION_INSTALL="1.18.3" ; \
-    if [ "$ARCH" = "arm64v8" ] ; then \
-        wget -O /tmp/go${GO_VERSION_INSTALL}.linux-arm64.tar.gz https://go.dev/dl/go${GO_VERSION_INSTALL}.linux-arm64.tar.gz ; \
-    else \
-        wget -O /tmp/go${GO_VERSION_INSTALL}.linux-amd64.tar.gz https://go.dev/dl/go${GO_VERSION_INSTALL}.linux-amd64.tar.gz ; \
-    fi && \
+    wget -O /tmp/go${GO_VERSION_INSTALL}.linux-$(dpkg-architecture -qDEB_HOST_ARCH).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
+RUN echo "export PATH=/opt/go/bin:$PATH" >> /etc/bash.bashrc
 
 # Packages needed for ipaddrcheck
 RUN apt-get update && apt-get install -y \
-- 
cgit v1.2.3


From e66c8b6cafa482688ebddd976030a2ff758a96b8 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 30 Dec 2022 22:20:32 +0100
Subject: container: T578: backport podman from 1.4 development branch

---
 .../archives/bullseye.pref.chroot                  | 32 ++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/data/live-build-config/archives/bullseye.pref.chroot b/data/live-build-config/archives/bullseye.pref.chroot
index 1dd6e8d5..c2efd86e 100644
--- a/data/live-build-config/archives/bullseye.pref.chroot
+++ b/data/live-build-config/archives/bullseye.pref.chroot
@@ -6,6 +6,38 @@ Package: ddclient
 Pin: release n=bullseye
 Pin-Priority: 600
 
+Package: podman
+Pin: release n=bullseye
+Pin-Priority: 600
+
+Package: libseccomp2
+Pin: release n=bullseye
+Pin-Priority: 600
+
+Package: conmon
+Pin: release n=bullseye
+Pin-Priority: 600
+
+Package: containernetworking-plugins
+Pin: release n=bullseye
+Pin-Priority: 600
+
+Package: runc
+Pin: release n=bullseye
+Pin-Priority: 600
+
+Package: golang-github-containers-common
+Pin: release n=bullseye
+Pin-Priority: 600
+
+Package: golang-github-containers-image
+Pin: release n=bullseye
+Pin-Priority: 600
+
+Package: skopeo
+Pin: release n=bullseye
+Pin-Priority: 600
+
 Package: squashfs-tools
 Pin: release n=bullseye
 Pin-Priority: -10
-- 
cgit v1.2.3