disable network and use only ADD to get network things

Signed-off-by: Avi Deitcher <avi@deitcher.net>
lf-edge · Oct 18, 2022 · 5d15a1c · 5d15a1c
1 parent fb6b2a9
commit 5d15a1c
Show file tree

Hide file tree

Showing 45 changed files with 268 additions and 170 deletions.
diff --git a/pkg/acrn-kernel/Dockerfile b/pkg/acrn-kernel/Dockerfile
@@ -1,7 +1,7 @@
 FROM lfedge/eve-alpine:145f062a40639b6c65efa36bed1c5614b873be52 as kernel-build
 
 ENV BUILD_PKGS \
-    argp-standalone automake bash bc binutils-dev bison build-base curl \
+    argp-standalone automake bash bc binutils-dev bison build-base \
     diffutils flex git gmp-dev gnupg installkernel kmod openssl-dev    \
     linux-headers ncurses-dev python3 findutils sed squashfs-tools tar  \
     xz xz-dev zlib-dev openssl lz4 lz4-libs elfutils-libelf elfutils-dev
@@ -11,9 +11,8 @@ RUN eve-alpine-deploy.sh
 # Download acrn-kernel
 ENV KERNEL_VERSION acrn-2019w39.3-150000p
 ENV KERNEL_SOURCE=https://github.com/projectacrn/acrn-kernel/archive/${KERNEL_VERSION}.tar.gz
-RUN \
-    [ -f "$(basename ${KERNEL_SOURCE})" ] || curl -fsSLO "${KERNEL_SOURCE}" && \
-    tar --absolute-names -xz < "$(basename ${KERNEL_SOURCE})" && mv "/acrn-kernel-${KERNEL_VERSION}" /acrn-kernel
+ADD ${KERNEL_SOURCE} /kernel.tar.gz
+RUN tar --absolute-names -xz < /kernel.tar.gz && mv "/acrn-kernel-${KERNEL_VERSION}" /acrn-kernel
 RUN ls -l /acrn-kernel
 
 # Apply local patches

diff --git a/pkg/acrn-kernel/build.yml b/pkg/acrn-kernel/build.yml
@@ -1,3 +1,2 @@
 image: eve-acrn-kernel
 org: lfedge
-network: yes
diff --git a/pkg/acrn/Dockerfile b/pkg/acrn/Dockerfile
@@ -3,7 +3,7 @@ FROM lfedge/eve-alpine:145f062a40639b6c65efa36bed1c5614b873be52 AS kernel-build
 ENV BUILD_PKGS \
     gcc make libc-dev dev86 xz-dev perl bash python3-dev gettext iasl         \
     util-linux-dev ncurses-dev glib-dev pixman-dev libaio-dev yajl-dev        \
-    argp-standalone linux-headers git patch texinfo curl tar bash socat       \
+    argp-standalone linux-headers git patch texinfo tar bash socat       \
     openssh python3 libc-dev openssl-dev openssl libpciaccess libpciaccess-dev\
     bsd-compat-headers libusb libusb-dev gnu-efi-dev py3-pip
 RUN eve-alpine-deploy.sh
@@ -12,9 +12,8 @@ RUN pip3 install kconfiglib==12.14.1
 
 ENV ACRN_VERSION 1.3
 ENV ACRN_SOURCE=https://github.com/projectacrn/acrn-hypervisor/archive/v${ACRN_VERSION}.tar.gz
-RUN \
-    [ -f "$(basename ${ACRN_SOURCE})" ] || curl -fsSLO "${ACRN_SOURCE}" && \
-    tar --absolute-names -xz < "$(basename ${ACRN_SOURCE})" && mv "/acrn-hypervisor-${ACRN_VERSION}" /acrn-hypervisor
+ADD ${ACRN_SOURCE} /acrn.tar.gz
+RUN tar --absolute-names -xz < /acrn.tar.gz && mv "/acrn-hypervisor-${ACRN_VERSION}" /acrn-hypervisor
 RUN ls -l /acrn-hypervisor
 # Apply local patches
 COPY patches-${ACRN_VERSION} /patches

diff --git a/pkg/acrn/build.yml b/pkg/acrn/build.yml
@@ -1,3 +1,2 @@
 image: eve-acrn
 org: lfedge
-network: yes
diff --git a/pkg/debug/Dockerfile b/pkg/debug/Dockerfile
@@ -27,7 +27,8 @@ RUN su builder -c 'cd /musl && abuild checksum && abuild -r'
 RUN apk add -p /out --allow-untrusted /home/builder/packages/*/musl-1.2*.apk
 
 # hadolint ignore=DL4006
-RUN curl -L https://www.ezix.org/software/files/lshw-B.${LSHW_VERSION}.tar.gz | tar xzvf -
+ADD https://www.ezix.org/software/files/lshw-B.${LSHW_VERSION}.tar.gz lshw.tar.gz
+RUN tar -xzvf lshw.tar.gz
 
 COPY lshw/ lshw-B.${LSHW_VERSION}/
 
@@ -42,7 +43,8 @@ RUN for patch in fix-musl-sc_long_bit.patch wrapper-for-basename.patch 155652295
 # building hexedit
 WORKDIR /tmp/hexedit/hexedit-1.5
 # hadolint ignore=DL4006
-RUN curl -L https://github.com/pixel/hexedit/archive/refs/tags/1.5.tar.gz | tar -C .. -xzvf -
+ADD https://github.com/pixel/hexedit/archive/refs/tags/1.5.tar.gz ../1.5.tar.gz
+RUN tar -C .. -xzvf ../1.5.tar.gz
 RUN ./autogen.sh && ./configure && make DESTDIR=/out install
 
 # tweaking various bit

diff --git a/pkg/debug/build.yml b/pkg/debug/build.yml
@@ -1,6 +1,5 @@
 image: eve-debug
 org: lfedge
-network: yes
 config:
   pid: host
   net: host

diff --git a/pkg/dom0-ztools/Dockerfile b/pkg/dom0-ztools/Dockerfile
@@ -10,12 +10,16 @@ COPY /patches /
 #  * ZFS on Linux
 ENV ZFS_VERSION=2.1.2
 ENV ZFS_COMMIT=zfs-${ZFS_VERSION}
-ENV ZFS_REPO=https://github.com/openzfs/zfs.git
+ENV ZFS_REPO=https://github.com/openzfs/zfs
 ENV ZFS_PATCH_DIR=/patches-zfs-"${ZFS_VERSION}"
 
 WORKDIR /tmp/zfs
 
-RUN git clone --depth 1 -b ${ZFS_COMMIT} ${ZFS_REPO} .
+ADD ${ZFS_REPO}/tarball/${ZFS_COMMIT}/ zfs.tgz
+RUN tar -zxvf zfs.zip && \
+    mv openzfs-zfs-*/* . && \
+    rm -rf openzfs-zfs-* && \
+    rm zfs.tgz
 RUN set -e; \
     if [ ! -d "${ZFS_PATCH_DIR}" ]; then \
         echo "No such dir ${ZFS_PATCH_DIR}"; \

diff --git a/pkg/dom0-ztools/build.yml b/pkg/dom0-ztools/build.yml
@@ -1,3 +1,2 @@
 org: lfedge
 image: eve-dom0-ztools
-network: yes
diff --git a/pkg/edgeview/build.yml b/pkg/edgeview/build.yml
@@ -1,6 +1,5 @@
 image: eve-edgeview
 org: lfedge
-network: yes
 config:
   binds:
     - /:/hostfs:ro

diff --git a/pkg/eve/build.yml b/pkg/eve/build.yml
@@ -1,3 +1,2 @@
 image: eve
 org: lfedge
-network: yes
diff --git a/pkg/fw/Dockerfile b/pkg/fw/Dockerfile
@@ -1,18 +1,20 @@
 FROM lfedge/eve-alpine:145f062a40639b6c65efa36bed1c5614b873be52 as build
 
-ENV BUILD_PKGS curl tar make
+ENV BUILD_PKGS tar make
 RUN eve-alpine-deploy.sh
 
 ENV WIRELESS_REGDB_VERSION 2022.06.06
 ENV WIRELESS_REGDB_REPO https://mirrors.edge.kernel.org/pub/software/network/wireless-regdb/wireless-regdb
+ADD ${WIRELESS_REGDB_REPO}-${WIRELESS_REGDB_VERSION}.tar.gz /wireless-regdb.tar.gz
 RUN mkdir /wireless-regdb &&\
-    curl -fsSL ${WIRELESS_REGDB_REPO}-${WIRELESS_REGDB_VERSION}.tar.gz | tar -xz --strip-components=1 -C /wireless-regdb &&\
+    tar -xz --strip-components=1 -C /wireless-regdb -f /wireless-regdb.tar.gz &&\
     cp /wireless-regdb/regulatory.db /wireless-regdb/regulatory.db.p7s /lib/firmware
 
 ENV LINUX_FIRMWARE_VERSION 20220708
 ENV LINUX_FIRMWARE_URL https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware
+ADD ${LINUX_FIRMWARE_URL}-${LINUX_FIRMWARE_VERSION}.tar.gz /linux-firmware.tar.gz
 RUN mkdir /linux-firmware &&\
-    curl -fsSL ${LINUX_FIRMWARE_URL}-${LINUX_FIRMWARE_VERSION}.tar.gz | tar -xz --strip-components=1 -C /linux-firmware &&\
+    tar -xz --strip-components=1 -C /linux-firmware /linux-firmware.tar.gz &&\
     make -C /linux-firmware FIRMWAREDIR="/lib/firmware" install
 
 # patch merged, but not released, remove this when update LINUX_FIRMWARE_VERSION
@@ -30,18 +32,19 @@ RUN ln -s ../cypress/cyfmac43430-sdio.bin /lib/firmware/brcm/brcmfmac43430-sdio.
 
 ENV RPI_FIRMWARE_VERSION 2c8f665254899a52260788dd902083bb57a99738
 ENV RPI_FIRMWARE_URL https://github.com/RPi-Distro/firmware-nonfree/archive
+ADD ${RPI_FIRMWARE_URL}/${RPI_FIRMWARE_VERSION}.tar.gz /rpifirmware.tar.gz
 RUN mkdir /rpi-firmware &&\
-    curl -fsSL ${RPI_FIRMWARE_URL}/${RPI_FIRMWARE_VERSION}.tar.gz | tar -xz --strip-components=1 -C /rpi-firmware &&\
+    tar -xz --strip-components=1 -C /rpi-firmware -f /rpifirmware.tar.gz / &&\
     cp -a /rpi-firmware/debian/config/brcm80211/brcm/brcmfmac43436* /lib/firmware/brcm
 
 ENV RPI_BT_FIRMWARE_VERSION e7fd166981ab4bb9a36c2d1500205a078a35714d
 ENV RPI_BT_FIRMWARE_URL https://github.com/RPi-Distro/bluez-firmware/raw
 
 WORKDIR /lib/firmware/brcm
-RUN curl -fsSL ${RPI_BT_FIRMWARE_URL}/${RPI_BT_FIRMWARE_VERSION}/broadcom/BCM43430A1.hcd -O &&\
-    curl -fsSL ${RPI_BT_FIRMWARE_URL}/${RPI_BT_FIRMWARE_VERSION}/broadcom/BCM4345C0.hcd -O &&\
-    curl -fsSL ${RPI_BT_FIRMWARE_URL}/${RPI_BT_FIRMWARE_VERSION}/broadcom/BCM43430B0.hcd -O &&\
-    curl -fsSL ${RPI_BT_FIRMWARE_URL}/${RPI_BT_FIRMWARE_VERSION}/broadcom/BCM4345C5.hcd -O
+ADD ${RPI_BT_FIRMWARE_URL}/${RPI_BT_FIRMWARE_VERSION}/broadcom/BCM43430A1.hcd .
+ADD ${RPI_BT_FIRMWARE_URL}/${RPI_BT_FIRMWARE_VERSION}/broadcom/BCM4345C0.hcd .
+ADD ${RPI_BT_FIRMWARE_URL}/${RPI_BT_FIRMWARE_VERSION}/broadcom/BCM43430B0.hcd .
+ADD ${RPI_BT_FIRMWARE_URL}/${RPI_BT_FIRMWARE_VERSION}/broadcom/BCM4345C5.hcd .
 
 FROM lfedge/eve-alpine:145f062a40639b6c65efa36bed1c5614b873be52 as compactor
 ENTRYPOINT []

diff --git a/pkg/fw/build.yml b/pkg/fw/build.yml
@@ -1,3 +1,2 @@
 image: eve-fw
 org: lfedge
-network: yes
diff --git a/pkg/guacd/build.yml b/pkg/guacd/build.yml
@@ -1,6 +1,5 @@
 image: eve-guacd
 org: lfedge
-network: yes
 config:
   binds:
     - /dev:/dev

diff --git a/pkg/ipxe/Dockerfile b/pkg/ipxe/Dockerfile
@@ -1,11 +1,15 @@
 FROM lfedge/eve-alpine:145f062a40639b6c65efa36bed1c5614b873be52 AS build
 
-ENV BUILD_PKGS patch curl make gcc perl util-linux-dev git mtools linux-headers musl-dev xz-dev
+ENV BUILD_PKGS patch make gcc perl util-linux-dev git mtools linux-headers musl-dev xz-dev
 # bash xorriso coreutils syslinux
 RUN eve-alpine-deploy.sh
 
 WORKDIR /ws
-RUN git clone --depth 1 -b v1.21.1 https://github.com/ipxe/ipxe.git .
+ADD https://github.com/ipxe/ipxe/tarball/v1.21.1 /ipxe.tgz
+RUN tar -zxvf /ipxe.tgz && \
+    mv ipxe-ipxe-*/* . && \
+    rm -rf ipxe-ipxe-* && \
+    rm /ipxe.tgz
 
 COPY embedded.cfg src/embedded.cfg
 COPY *patch /tmp/

diff --git a/pkg/ipxe/build.yml b/pkg/ipxe/build.yml
@@ -1,3 +1,2 @@
 image: eve-ipxe
 org: lfedge
-network: yes
diff --git a/pkg/k3s/Dockerfile b/pkg/k3s/Dockerfile
@@ -1,12 +1,16 @@
 FROM lfedge/eve-alpine:145f062a40639b6c65efa36bed1c5614b873be52 as build
-ENV BUILD_PKGS make gcc git musl-dev linux-headers curl bash pkgconf libseccomp-dev go patch
+ENV BUILD_PKGS make gcc git musl-dev linux-headers bash pkgconf libseccomp-dev go patch
 RUN eve-alpine-deploy.sh
 
 ARG K3SVER=v1.18.4+k3s1
 
 WORKDIR /k3s
 COPY 0001-go-mod.patch /tmp/
-RUN git clone -b ${K3SVER} --depth 1 https://github.com/rancher/k3s.git .
+ADD https://github.com/rancher/k3s/tarball/${K3SVER} /tmp/k3s.tgz
+RUN tar -zxvf /tmp/k3s.tgz && \
+    mv rancher-k3s-*/* . && \
+    rm -rf rancher-k3s-* && \
+    rm /tmp/k3s.tgz
 RUN patch -p1 < /tmp/0001-go-mod.patch
 RUN scripts/download
 RUN scripts/build

diff --git a/pkg/k3s/build.yml b/pkg/k3s/build.yml
@@ -1,3 +1,2 @@
 image: eve-k3s
 org: lfedge
-network: yes
diff --git a/pkg/kernel/Dockerfile b/pkg/kernel/Dockerfile
@@ -1,22 +1,37 @@
 # This file must be kept as much in sync with pkg/new-kernel/Dockerfile as posisble
-FROM lfedge/eve-alpine:145f062a40639b6c65efa36bed1c5614b873be52 AS kernel-build
+FROM lfedge/eve-alpine:145f062a40639b6c65efa36bed1c5614b873be52 AS kernel-build-base
 
 ENV BUILD_PKGS \
-    argp-standalone automake bash bc binutils-dev bison build-base curl \
+    argp-standalone automake bash bc binutils-dev bison build-base \
     diffutils flex git gmp-dev gnupg installkernel kmod elfutils-dev    \
     linux-headers libunwind-dev mpc1-dev mpfr-dev ncurses-dev findutils \
     openssl-dev patch rsync sed squashfs-tools tar xz xz-dev zlib-dev openssl \
     attr-dev autoconf file coreutils libtirpc-dev libtool util-linux-dev
 RUN eve-alpine-deploy.sh
 
-ARG KERNEL_VERSION_aarch64=5.10.121
-ARG KERNEL_VERSION_x86_64=5.10.121
-ARG KERNEL_SOURCE
-ARG KERNEL_SHA256_SUMS
-ARG KERNEL_PGP2_SIGN
+# set versions for arm64
+FROM kernel-build-base AS kernel-build-arm64
+ARG KERNEL_VERSION_arm64=5.15.46
+# this has to be specified separately because of dockerfile limitations
+ARG KERNEL_MAJOR=5
+ENV KERNEL_VERSION=${KERNEL_VERSION_arm64}
+ENV KERNEL_MAJOR=${KERNEL_MAJOR}
+
+# set versions for amd64
+FROM kernel-build-base AS kernel-build-amd64
+ARG KERNEL_VERSION_amd64=5.15.46
+# this has to be specified separately because of dockerfile limitations
+ARG KERNEL_MAJOR=5
+ENV KERNEL_VERSION=${KERNEL_VERSION_amd64}
+ENV KERNEL_MAJOR=${KERNEL_MAJOR}
+
+# build for all arches
+FROM kernel-build-${TARGET_ARCH} AS kernel-build
+
+ARG KERNEL_SOURCE=https://www.kernel.org/pub/linux/kernel/v${KERNEL_MAJOR}.x/linux-${KERNEL_VERSION}.tar.xz
+ARG KERNEL_SHA256_SUMS=https://www.kernel.org/pub/linux/kernel/v${KERNEL_MAJOR}.x/sha256sums.asc
+ARG KERNEL_PGP2_SIGN=https://www.kernel.org/pub/linux/kernel/v${KERNEL_MAJOR}.x/linux-${KERNEL_VERSION}.tar.sign
 
-# The only variable that is used everywhere is KERNEL_SERIES, so we stick it into env
-SHELL ["/bin/sh", "-c", "export KERNEL_SERIES=$(eval echo \\$KERNEL_VERSION_$(uname -m) | sed -e 's#.[^.]*$#.x#') ; /bin/sh -c \"$1\"", "-" ]
 
 # We copy the entire directory. This copies some unneeded files, but
 # allows us to check for the existence /patches-${KERNEL_SERIES} to
@@ -25,25 +40,24 @@ COPY / /
 
 # Download and verify kernel
 # PGP keys: 589DA6B1 (greg@kroah.com) & 6092693E (autosigner@kernel.org) & 00411886 (torvalds@linux-foundation.org)
-RUN KERNEL_VERSION="$(eval echo \$KERNEL_VERSION_"$(uname -m)")" && KERNEL_MAJOR="$(echo "$KERNEL_VERSION" | cut -f1 -d.)" && \
-    KERNEL_SOURCE=${KERNEL_SOURCE:-https://www.kernel.org/pub/linux/kernel/v${KERNEL_MAJOR}.x/linux-${KERNEL_VERSION}.tar.xz} && \
-    KERNEL_SHA256_SUMS=${KERNEL_SHA256_SUMS:-https://www.kernel.org/pub/linux/kernel/v${KERNEL_MAJOR}.x/sha256sums.asc} && \
-    KERNEL_PGP2_SIGN=${KERNEL_PGP2_SIGN:-https://www.kernel.org/pub/linux/kernel/v${KERNEL_MAJOR}.x/linux-${KERNEL_VERSION}.tar.sign} && \
-    curl -fsSLO ${KERNEL_SHA256_SUMS} && \
-    gpg2 -q --import keys.asc && \
+ADD ${KERNEL_SHA256_SUMS} kernel-sums.asc
+ADD ${KERNEL_PGP2_SIGN} linux-${KERNEL_VERSION}.tar.sign
+ADD ${KERNEL_SOURCE} /tmp/linux-${KERNEL_VERSION}.tar.xz
+
+RUN gpg2 -q --import keys.asc && \
     gpg2 --verify sha256sums.asc && \
     KERNEL_SHA256=$(grep linux-${KERNEL_VERSION}.tar.xz sha256sums.asc | cut -d ' ' -f 1) && \
-    [ -f linux-${KERNEL_VERSION}.tar.xz ] || curl -fsSLO ${KERNEL_SOURCE} && \
+    [ -f linux-${KERNEL_VERSION}.tar.xz ] || mv /tmp/linux-${KERNEL_VERSION}.tar.xz . && \
     echo "${KERNEL_SHA256}  linux-${KERNEL_VERSION}.tar.xz" | sha256sum -c - && \
     xz -d linux-${KERNEL_VERSION}.tar.xz && \
-    curl -fsSLO ${KERNEL_PGP2_SIGN} && \
     gpg2 --verify linux-${KERNEL_VERSION}.tar.sign linux-${KERNEL_VERSION}.tar && \
     cat linux-${KERNEL_VERSION}.tar | tar --absolute-names -x && mv /linux-${KERNEL_VERSION} /linux && \
     rm -rf /out && mkdir /out && echo "KERNEL_SOURCE=${KERNEL_SOURCE}" > /out/kernel-source-info
 
 # Apply local patches
 WORKDIR /linux
-RUN set -e ; [ ! -d /patches-"${KERNEL_SERIES}" ] || for patch in /patches-"${KERNEL_SERIES}"/*.patch; do \
+RUN set -e ; KERNEL_SERIES=${KERNEL_VERSION%.*}.x; \
+    [ ! -d /patches-"${KERNEL_SERIES}" ] || for patch in /patches-"${KERNEL_SERIES}"/*.patch; do \
         echo "Applying $patch"; \
         patch -p1 < "$patch"; \
     done
@@ -56,6 +70,7 @@ RUN case $(uname -m) in \
         KERNEL_DEF_CONF=/linux/arch/arm64/configs/defconfig; \
         ;; \
     esac  && \
+    KERNEL_SERIES=${KERNEL_VERSION%.*}.x; \
     cp /kernel_config-${KERNEL_SERIES}-$(uname -m) ${KERNEL_DEF_CONF}; \
     if [ -n "${EXTRA}" ]; then \
         sed -i "s/CONFIG_LOCALVERSION=\"-linuxkit\"/CONFIG_LOCALVERSION=\"-linuxkit${EXTRA}\"/" ${KERNEL_DEF_CONF}; \
@@ -88,12 +103,15 @@ RUN make INSTALL_MOD_PATH=/tmp/kernel-modules modules_install
 #  * ZFS on Linux
 ENV ZFS_VERSION=2.1.2
 ENV ZFS_COMMIT=zfs-${ZFS_VERSION}
-ENV ZFS_REPO=https://github.com/openzfs/zfs.git
+ENV ZFS_REPO=https://github.com/openzfs/zfs
 ENV ZFS_PATCH_DIR=/patches-zfs-"${ZFS_VERSION}"
 
 WORKDIR /tmp/zfs
 
-RUN git clone --depth 1 -b ${ZFS_COMMIT} ${ZFS_REPO} .
+ADD ${ZFS_REPO}/tarball/${ZFS_COMMIT} /zfs.tgz
+RUN tar -zxvf /zfs.tgz && \
+    mv openzfs-zfs-* . && \
+    rm /zfs.tgz
 RUN set -e; \
     if [ ! -d "${ZFS_PATCH_DIR}" ]; then \
         echo "No such dir ${ZFS_PATCH_DIR}"; \
@@ -118,9 +136,11 @@ RUN unzip -d /tmp /tmp/xr.zip ;\
                    M=/tmp/xr_usb_serial_common_lnx-3.6-and-newer-pak \
          modules modules_install
 
-RUN git clone https://github.com/brektrou/rtl8821CU.git /tmp/rtl8821CU &&\
-    (cd /tmp/rtl8821CU && git checkout 8c2226a7 ) &&\
-    make -C /tmp/rtl8821CU KSRC=/linux modules &&\
+ADD https://github.com/brektrou/rtl8821CU/tarball/8c2226a7 /rtl8821CU.tgz
+RUN tar -zxvf /rtl8821CU.tgz && \
+    mv brektrou-rtl8821CU-* /tmp/rtl8821CU && \
+    rm /rtl8821CU.tgz
+RUN make -C /tmp/rtl8821CU KSRC=/linux modules &&\
     install -D -p -m 644 /tmp/rtl8821CU/8821cu.ko $(echo /tmp/kernel-modules/lib/modules/*)/kernel/drivers/net/wireless/realtek/rtl8821cu/8821cu.ko
 
 # Strip at least some of the modules to conserve space

diff --git a/pkg/kernel/build.yml b/pkg/kernel/build.yml
@@ -1,3 +1,2 @@
 image: eve-kernel
 org: lfedge
-network: yes
diff --git a/pkg/kvm-tools/Dockerfile b/pkg/kvm-tools/Dockerfile
@@ -1,9 +1,9 @@
 FROM lfedge/eve-alpine:145f062a40639b6c65efa36bed1c5614b873be52 as build
-# Building qemu in strip-down mirovm only mode: curl
+# Building qemu in strip-down mirovm only mode:
 # qemu 5.1 dependencies: python3 glib-dev pixman-dev
 # qemu 5.2+ dependencies: py3-setuptools bash perl
 # ninja dependencies: cmake g++
-ENV BUILD_PKGS gcc make libc-dev binutils-dev patch libaio-dev zlib-dev zlib-static linux-headers libvncserver-dev curl python3 glib-dev pixman-dev py3-setuptools bash perl cmake g++
+ENV BUILD_PKGS gcc make libc-dev binutils-dev patch libaio-dev zlib-dev zlib-static linux-headers libvncserver-dev python3 glib-dev pixman-dev py3-setuptools bash perl cmake g++
 ENV BUILD_PKGS_arm64 dtc dtc-dev
 # libgcc, pixman and glib are required for qemu
 # it maybe possible to get rid of libgcc & pixman
@@ -27,16 +27,16 @@ RUN patch -p1 < /0001-Makefile-Update-bfd-detection.patch ;\
 
 # building ninja
 WORKDIR /ninja-1.10.1
-# hadolint ignore=DL4006
-RUN curl -L https://github.com/ninja-build/ninja/archive/v1.10.1.tar.gz | tar -C / -xzf -
+ADD https://github.com/ninja-build/ninja/archive/v1.10.1.tar.gz /ninja.tar.gz
+RUN tar -C / -xzf /ninja.tar.gz
 RUN cmake -Bbuild-cmake -H.
 RUN cmake --build build-cmake
 RUN cmake --install build-cmake --prefix /usr
 
 # building qemu
 WORKDIR /qemu-5.2.0
-# hadolint ignore=DL4006
-RUN curl https://download.qemu.org/qemu-5.2.0.tar.xz | tar -C / -xJf -
+ADD https://download.qemu.org/qemu-5.2.0.tar.xz /qemu-5.2.0.tar.xz
+RUN tar -C / -xJf /qemu-5.2.0.tar.xz
 
 COPY i386-softmmu.mak default-configs/devices/i386-softmmu.mak
 COPY meson.build hw/acpi/meson.build

diff --git a/pkg/kvm-tools/build.yml b/pkg/kvm-tools/build.yml
@@ -1,6 +1,5 @@
 image: eve-kvm-tools
 org: lfedge
-network: yes
 config:
   binds:
     - /dev:/dev

diff --git a/pkg/mkimage-iso-efi/build.yml b/pkg/mkimage-iso-efi/build.yml
@@ -1,3 +1,2 @@
 image: eve-mkimage-iso-efi
 org: lfedge
-network: true
diff --git a/pkg/mkimage-raw-efi/build.yml b/pkg/mkimage-raw-efi/build.yml
@@ -1,4 +1,3 @@
 org: lfedge
 image: eve-mkimage-raw-efi
-network: yes
 
diff --git a/pkg/mkrootfs-ext4/build.yml b/pkg/mkrootfs-ext4/build.yml
@@ -1,3 +1,2 @@
 org: lfedge
 image: eve-mkrootfs-ext4
-network: true
diff --git a/pkg/mkrootfs-squash/build.yml b/pkg/mkrootfs-squash/build.yml
@@ -1,3 +1,2 @@
 org: lfedge
 image: eve-mkrootfs-squash
-network: true