diff options
| -rw-r--r-- | data/build-types/development.toml | 1 | ||||
| -rwxr-xr-x | data/live-build-config/hooks/live/41-init-podman-images.chroot | 8 | ||||
| -rw-r--r-- | docker/Dockerfile | 3 |
3 files changed, 1 insertions, 11 deletions
diff --git a/data/build-types/development.toml b/data/build-types/development.toml index 31c50522..f0207a6a 100644 --- a/data/build-types/development.toml +++ b/data/build-types/development.toml @@ -2,7 +2,6 @@ packages = [ "gdb", "strace", "apt-rdepends", - "skopeo", "tshark", "vim", "vyos-1x-smoketest" diff --git a/data/live-build-config/hooks/live/41-init-podman-images.chroot b/data/live-build-config/hooks/live/41-init-podman-images.chroot deleted file mode 100755 index 1915a40f..00000000 --- a/data/live-build-config/hooks/live/41-init-podman-images.chroot +++ /dev/null @@ -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 diff --git a/docker/Dockerfile b/docker/Dockerfile index de513115..9845574e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -92,8 +92,7 @@ RUN apt-get update && apt-get install -y \ python3-flake8 \ python3-autopep8 \ debootstrap \ - live-build \ - skopeo + live-build # vyos-build now also makes use of TOML - install yq which has toml support RUN pip install yq==3.1.0 |