From 5796825e830c9be11345e48ad4e7316eb3b7210a Mon Sep 17 00:00:00 2001
From: sarthurdev <965089+sarthurdev@users.noreply.github.com>
Date: Mon, 7 Nov 2022 17:34:52 +0100
Subject: Revert "Docker: T2216: add required skopeo package to build
 container"

This reverts commit 3a29e22dcd579349aac987b5825073527af38e58.
---
 docker/Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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
-- 
cgit v1.2.3


From 08beb1032ecd677c3625b61fb9ab715da8b92195 Mon Sep 17 00:00:00 2001
From: sarthurdev <965089+sarthurdev@users.noreply.github.com>
Date: Mon, 7 Nov 2022 17:35:11 +0100
Subject: Revert "containers: T2216: Include busybox container image, used in
 smoketests (1MB)"

This reverts commit 5f186754fe54e9a5b0f7cdea1b295778ddd6796a.
---
 data/build-types/development.toml                              | 1 -
 data/live-build-config/hooks/live/41-init-podman-images.chroot | 8 --------
 2 files changed, 9 deletions(-)
 delete mode 100755 data/live-build-config/hooks/live/41-init-podman-images.chroot

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
-- 
cgit v1.2.3