disable network and use only ADD to get network things, use advanced …

…syntax for cases that *really* need ADD git

Signed-off-by: Avi Deitcher <avi@deitcher.net>

Makefile

@@ -12,7 +12,7 @@ uniq = $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1)))
 
 # you are not supposed to tweak these variables -- they are effectively R/O
 HV_DEFAULT=kvm
-GOVER ?= 1.18.5
+GOVER ?= 1.19.2
 PKGBASE=github.com/lf-edge/eve
 GOMODULE=$(PKGBASE)/pkg/pillar
 GOTREE=$(CURDIR)/pkg/pillar
@@ -261,7 +261,7 @@ DOCKER_GO = _() { $(SET_X); mkdir -p $(CURDIR)/.go/src/$${3:-dummy} ; mkdir -p $
 
 PARSE_PKGS=$(if $(strip $(EVE_HASH)),EVE_HASH=)$(EVE_HASH) DOCKER_ARCH_TAG=$(DOCKER_ARCH_TAG) ./tools/parse-pkgs.sh
 LINUXKIT=$(BUILDTOOLS_BIN)/linuxkit
-LINUXKIT_VERSION=d589bd18f1f4a43a4e4667e6e1d46bde5b315ed1
+LINUXKIT_VERSION=f8947c6ae6c518da585e515fbd75b4e0747f714e
 LINUXKIT_SOURCE=https://github.com/linuxkit/linuxkit.git
 LINUXKIT_OPTS=$(if $(strip $(EVE_HASH)),--hash) $(EVE_HASH) $(if $(strip $(EVE_REL)),--release) $(EVE_REL)
 LINUXKIT_PKG_TARGET=build

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,10 @@ 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
+
+# hadolint ignore=DL3020
+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

pkg/acrn-kernel/build.yml

@@ -1,3 +1,2 @@
 image: eve-acrn-kernel
 org: lfedge
-network: yes

pkg/acrn/Dockerfile

@@ -1,20 +1,26 @@
+# syntax=docker/dockerfile-upstream:master-labs
 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
 
-RUN pip3 install kconfiglib==12.14.1
+# RUN pip3 install will not work with no network connection. Some day, ADD may support
+# pip3, but for now, we can replicate it using git clone
+#RUN pip3 install kconfiglib==12.14.1
+ADD --keep-git-dir=true https://github.com/ulfalizer/Kconfiglib.git#v12.14.1 /kconfiglib
+RUN cd /kconfiglib && python3 setup.py install
 
 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
+
+# hadolint ignore=DL3020
+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

pkg/acrn/build.yml

@@ -1,3 +1,2 @@
 image: eve-acrn
 org: lfedge
-network: yes

pkg/debug/Dockerfile

@@ -20,14 +20,18 @@ RUN adduser -G abuild -D builder || :
 RUN su builder -c 'abuild-keygen -a -n'
 
 COPY --chown=builder:abuild abuild/ /
+ENV MUSL_VERSION v1.2.3
+ENV DISTFILES_MIRROR /tmp/mirror
+ADD --chown=builder:abuild https://git.musl-libc.org/cgit/musl/snapshot/${MUSL_VERSION}.tar.gz ${DISTFILES_MIRROR}/musl-${MUSL_VERSION}.tar.gz
 RUN su builder -c 'cd /musl && abuild checksum && abuild -r'
 
 # now install it locally so we can pick it up later on below
 # hadolint ignore=DL3019,DL3018
 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 +46,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

pkg/debug/build.yml

@@ -1,6 +1,5 @@
 image: eve-debug
 org: lfedge
-network: yes
 config:
   pid: host
   net: host

pkg/dom0-ztools/Dockerfile

@@ -10,12 +10,14 @@ 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.tgz  --strip-components=1 && \
+    rm zfs.tgz
 RUN set -e; \
     if [ ! -d "${ZFS_PATCH_DIR}" ]; then \
         echo "No such dir ${ZFS_PATCH_DIR}"; \
@@ -52,4 +54,5 @@ RUN cp -r /tmp/zfs-out/* /out
 
 FROM scratch
 COPY --from=zfs /out/ /
+# hadolint ignore=DL3020
 ADD rootfs/ /

pkg/dom0-ztools/build.yml

@@ -1,3 +1,2 @@
 org: lfedge
 image: eve-dom0-ztools
-network: yes

pkg/edgeview/Dockerfile

@@ -4,6 +4,7 @@ ENV PKGS alpine-baselayout musl-utils iproute2 iptables
 RUN eve-alpine-deploy.sh
 
 COPY src/  /edge-view/.
+COPY vendor  /edge-view/vendor
 COPY go.mod /edge-view/.
 COPY go.sum /edge-view/.
 COPY vendor /edge-view/vendor

pkg/edgeview/build.yml

@@ -1,6 +1,5 @@
 image: eve-edgeview
 org: lfedge
-network: yes
 config:
   binds:
     - /:/hostfs:ro

pkg/eve/build.yml

@@ -1,3 +1,2 @@
 image: eve
 org: lfedge
-network: yes

pkg/fscrypt/Dockerfile

@@ -0,0 +1,20 @@
+# syntax=docker/dockerfile-upstream:master-labs
+
+# SPDX-License-Identifier: Apache-2.0
+
+FROM lfedge/eve-alpine:145f062a40639b6c65efa36bed1c5614b873be52
+
+ENV BUILD_PKGS git gcc make libc-dev linux-pam-dev m4 findutils go util-linux make patch
+RUN eve-alpine-deploy.sh
+
+ENV FSCRYPT_COMMIT=b41569d397d3e66099cde07d8eef36b2f42dd0ec
+WORKDIR /go/src/github.com/google/fscrypt
+# hadolint ignore=DL3020
+ADD --keep-git-dir=true https://github.com/google/fscrypt.git#${FSCRYPT_COMMIT} .
+COPY patch/* ./
+RUN patch -p1 < patch01-no-pam.diff && \
+    patch -p1 < patch02-rotate-raw-key.diff && \
+    patch -p1 < patch03-vendor.diff && \
+    patch -p1 < patch04-goConv.diff && \
+    make && make DESTDIR=/out/opt/zededa/bin install
+

pkg/fscrypt/build.yml

@@ -0,0 +1,8 @@
+# linuxkit build template 
+#
+# SPDX-License-Identifier: Apache-2.0
+org: lfedge
+image: eve-fscrypt
+# we allow network in building fscrypt because we need it to downlaod go modules,
+# and it is limited to just this single target output.
+network: yes

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 -f /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 []

pkg/fw/build.yml

@@ -1,3 +1,2 @@
 image: eve-fw
 org: lfedge
-network: yes

pkg/grub/Dockerfile

@@ -1,4 +1,6 @@
-FROM lfedge/eve-alpine:145f062a40639b6c65efa36bed1c5614b873be52 as grub-build
+# syntax=docker/dockerfile-upstream:master-labs
+
+FROM lfedge/eve-alpine:145f062a40639b6c65efa36bed1c5614b873be52 as grub-build-base
 ENV BUILD_PKGS automake \
                make \
                bison \
@@ -23,66 +25,94 @@ RUN eve-alpine-deploy.sh
 ENV GRUB_MODULES_PORT="part_gpt fat ext2 iso9660 squash4 gzio linux acpi normal cpio crypto disk boot crc64 \
 search_disk_uuid search_part_label search_label xzio xfs video gfxterm serial gptprio chain probe reboot regexp smbios \
 part_msdos cat echo test configfile loopback"
+
+FROM grub-build-base AS grub-build-amd64
+ENV GRUB_MODULES="multiboot multiboot2 efi_uga efi_gop linuxefi gpt verify gcry_sha256 measurefs"
 ENV GRUB_MODULES_i386_pc="multiboot multiboot2 biosdisk gpt verify"
-ENV GRUB_MODULES_x86_64="multiboot multiboot2 efi_uga efi_gop linuxefi gpt verify gcry_sha256 measurefs"
-ENV GRUB_MODULES_aarch64="xen_boot efi_gop gpt"
-ENV GRUB_MODULES_riscv64=""
 ENV GRUB_COMMIT=71f9e4ac44142af52c3fc1860436cf9e432bf764
-ENV GRUB_TAG_riscv64=2.06
-ENV GRUB_TAG_aarch64=2.06
+ENV GRUB_PATCHES=patches
+# colon separates a platform from an additional option.
+# this is far from perfect, but it works for now.
+ENV GRUB_PLATFORM="efi pc:--disable-efiemu"
+
+FROM grub-build-base AS grub-build-arm64
+ENV GRUB_MODULES="xen_boot efi_gop gpt"
+ENV GRUB_COMMIT=2.06
+ENV GRUB_PATCHES="patches-${GRUB_COMMIT} patches-aarch64-${GRUB_COMMIT}"
+ENV GRUB_PLATFORM=efi
+
+FROM grub-build-base AS grub-build-riscv64
+ENV GRUB_MODULES=""
+ENV GRUB_COMMIT=2.06
+ENV GRUB_PATCHES="patches-${GRUB_COMMIT} patches-riscv64-${GRUB_COMMIT}"
+ENV GRUB_PLATFORM=efi
+
+FROM grub-build-base AS grub-build-i386
+ENV GRUB_MODULES="multiboot multiboot2 biosdisk gpt verify"
+ENV GRUB_COMMIT=71f9e4ac44142af52c3fc1860436cf9e432bf764
+ENV GRUB_PATCHES="patches-${GRUB_COMMIT}"
+ENV GRUB_PLATFORM=efi
 
-ENV GRUB_REPO=https://git.savannah.gnu.org/git/grub.git
+# hadolint ignore=DL3006
+FROM grub-build-${TARGETARCH} AS grub-build
+
+ENV GRUB_REPO=https://git.savannah.gnu.org/cgit/grub.git
 
 COPY / /
 # because python is not available
 RUN ln -s python3 /usr/bin/python && \
     mkdir /grub-lib
 
-# hadolint ignore=DL3003
+ADD ${GRUB_REPO}/snapshot/grub-${GRUB_COMMIT}.tar.gz /grub.tar.gz
+ENV GNULIB_REVISION=d271f868a8df9bbec29049d01e056481b7a1a263
+ADD --keep-git-dir git://git.sv.gnu.org/gnulib#${GNULIB_REVISION} /gnulib
+
+# the below does a weird init of a git repo, because we are not cloning the
+# repo, yet we need to be in a repo to apply patches with `git am`.
+# hadolint ignore=DL3003,SC2086
 RUN if [ ! -d "grub" ]; then \
-        git clone ${GRUB_REPO} \
-        && cd /grub \
-        && git config --add user.email a@b.c \
-        && git config user.name a \
-        && if [ "$(uname -m)" != x86_64 ]; then \
-            GRUB_COMMIT="$(git show-ref -s tags/grub-"$(eval echo "\$GRUB_TAG_$(uname -m)")")"; \
-        fi \
-        && git checkout -b grub-build "$GRUB_COMMIT" \
-        && if [ "$(uname -m)" != x86_64 ]; then \
-            rm -rf /patches \
-            && mv /patches-"$(eval echo "\$GRUB_TAG_$(uname -m)")" /patches \
-            && cp /patches-"$(uname -m)"-"$(eval echo "\$GRUB_TAG_$(uname -m)")"/* /patches/; \
-        fi \
-        && git am /patches/* \
-        && (./bootstrap || ./autogen.sh) ; \
+        tar -xzf /grub.tar.gz; \
+        mv "grub-${GRUB_COMMIT}" grub; \
+        rm -f /grub.tar.gz; \
+        cd grub; \
+        mkdir -p /apply/patches; \
+        for dir in ${GRUB_PATCHES}; do \
+            cp -r /${dir}/* /apply/patches; \
+        done; \
+        git config --global user.name "Your Name"; \
+        git config --global user.email "you@example.com"; \
+        git init . && git add . && git commit -m "init"; \
+        git am /apply/patches/*; \
+        (./bootstrap --gnulib-srcdir=/gnulib  || ./autogen.sh) ; \
     fi
 
 
 WORKDIR /grub
 
-ENV BUILD_GRUB="set -e && \
-  if [ -f Makefile ]; then make distclean; fi && \
-  ./configure --disable-werror --libdir=/grub-lib --with-platform=\${GRUB_PLATFORM} CFLAGS='-Os -Wno-unused-value' && \
-  make -j $(getconf _NPROCESSORS_ONLN) && \
-  make install"
-
-ENV GRUB_PLATFORM=efi
-RUN eval $BUILD_GRUB
-RUN if [ "$(uname -m)" = x86_64 ]; then GRUB_PLATFORM="pc --disable-efiemu" && eval "$BUILD_GRUB" ; fi
-
+# hadolint ignore=SC2046
+RUN set -e; for p in ${GRUB_PLATFORM}; do \
+      platform=${p%%:*}; \
+      begin=$(( ${#platform} + 1 )); \
+      opt=${p:${begin}}; \
+      [ -f Makefile ] && make distclean; \
+      ./configure --disable-werror --libdir=/grub-lib --with-platform="${platform}" ${opt} CFLAGS='-Os -Wno-unused-value'; \
+      make -j $(getconf _NPROCESSORS_ONLN); \
+      make install; \
+    done
 
 COPY embedded.cfg /
 
 # create the grub core image
-RUN case $(uname -m) in \
+# hadolint ignore=SC2086
+RUN case "$(uname -m)" in \
   x86_64) \
-    ./grub-mkimage -O x86_64-efi -d /grub-lib/grub/x86_64-efi -o /grub-lib/BOOTX64.EFI -p /EFI/BOOT ${GRUB_MODULES_PORT} ${GRUB_MODULES_x86_64} &&\
+    ./grub-mkimage -O x86_64-efi -d /grub-lib/grub/x86_64-efi -o /grub-lib/BOOTX64.EFI -p /EFI/BOOT ${GRUB_MODULES_PORT} ${GRUB_MODULES} &&\
     ./grub-mkimage -O i386-pc -d /grub-lib/grub/i386-pc -o /grub-lib/BOOT.pc -p /EFI/BOOT -c /embedded.cfg ${GRUB_MODULES_PORT} ${GRUB_MODULES_i386_pc} && \
     cp /grub-lib/grub/i386-pc/boot.img /grub-lib/BOOT.img ;;\
   aarch64) \
-    ./grub-mkimage -O arm64-efi -d /grub-lib/grub/arm64-efi -o /grub-lib/BOOTAA64.EFI -p /EFI/BOOT ${GRUB_MODULES_PORT} ${GRUB_MODULES_aarch64} ;; \
+    ./grub-mkimage -O arm64-efi -d /grub-lib/grub/arm64-efi -o /grub-lib/BOOTAA64.EFI -p /EFI/BOOT ${GRUB_MODULES_PORT} ${GRUB_MODULES} ;; \
   riscv64) \
-     ./grub-mkimage -O riscv64-efi -d /grub-lib/grub/riscv64-efi -o /grub-lib/BOOTRISCV64.EFI -p /EFI/BOOT ${GRUB_MODULES_PORT} ${GRUB_MODULES_riscv64} ;;\
+     ./grub-mkimage -O riscv64-efi -d /grub-lib/grub/riscv64-efi -o /grub-lib/BOOTRISCV64.EFI -p /EFI/BOOT ${GRUB_MODULES_PORT} ${GRUB_MODULES} ;;\
   esac
 
 FROM scratch

pkg/grub/build.yml

@@ -1,3 +1,2 @@
 org: lfedge
 image: eve-grub
-network: true

pkg/guacd/build.yml

@@ -1,6 +1,5 @@
 image: eve-guacd
 org: lfedge
-network: yes
 config:
   binds:
     - /dev:/dev