Merge pull request #279 from sarthurdev/containers_revert

containers: T2216: Revert container test specfic build changes

data/build-types/development.toml

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

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

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

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