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 #279 from sarthurdev/containers_revert

Browse Source 
containers: T2216: Revert container test specfic build changes
This commit is contained in:
Christian Poessinger 2022-11-07 17:40:30 +01:00 committed by GitHub
commit badf55cd2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/build-types/development.toml
View File

@ -2,7 +2,6 @@ packages = [
"gdb", "gdb",
"strace", "strace",
"apt-rdepends", "apt-rdepends",
"skopeo",
"tshark", "tshark",
"vim", "vim",
"vyos-1x-smoketest" "vyos-1x-smoketest"

8
data/live-build-config/hooks/live/41-init-podman-images.chroot
View File

@ -1,8 +0,0 @@
#!/bin/sh
# Download busybox container image for smoketests (only ~1MB)
# Skopeo only added on development builds
if command -v skopeo &>/dev/null; then
skopeo copy --additional-tag docker.io/library/busybox:stable docker://docker.io/library/busybox:stable docker-archive://usr/share/vyos/busybox-stable.tar
fi

3
docker/Dockerfile
View File

@ -92,8 +92,7 @@ RUN apt-get update && apt-get install -y \
python3-flake8 \ python3-flake8 \
python3-autopep8 \ python3-autopep8 \
debootstrap \ debootstrap \
live-build \ live-build
skopeo
# vyos-build now also makes use of TOML - install yq which has toml support # vyos-build now also makes use of TOML - install yq which has toml support
RUN pip install yq==3.1.0 RUN pip install yq==3.1.0