vyos/vyos-build
1
0
Fork 0
mirror of https://github.com/vyos/vyos-build.git synced 2025-10-01 20:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #291 from c-po/equuleus

Browse Source 
container: T578: backport podman from 1.4 development branch (equuleus)
This commit is contained in:
Christian Poessinger 2022-12-31 07:35:45 +01:00 committed by GitHub
commit 9a3a577b93
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
data/live-build-config/archives/bullseye.pref.chroot
View File

@ -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

11
docker/Dockerfile
View File

@ -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 \