From 00b470f7b105511dc79f4d7ef8df57beecfd4e84 Mon Sep 17 00:00:00 2001 From: Matthias Wirth Date: Wed, 6 Nov 2024 14:03:34 +0100 Subject: [PATCH] move unrelated dependencies out of the docker install script speeds up build by eliminating an apt update call --- src/modules/adsb-docker/start_chroot_script | 4 ---- src/modules/adsb-feeder/start_chroot_script | 7 ++++++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/modules/adsb-docker/start_chroot_script b/src/modules/adsb-docker/start_chroot_script index aaeadaab..5a42e250 100755 --- a/src/modules/adsb-docker/start_chroot_script +++ b/src/modules/adsb-docker/start_chroot_script @@ -19,10 +19,6 @@ install_cleanup_trap export DEBIAN_FRONTEND=noninteractive echo "Installing docker, each step may take a while:" - echo -n "Updating repositories... " - apt-get update -y - echo -n "Ensuring dependencies are installed... " - apt-get install -y git rtl-sdr apt-transport-https ca-certificates curl gnupg2 slirp4netns uidmap jq zstd netcat-openbsd echo -n "Getting docker..." curl -fsSL https://get.docker.com -o get-docker.sh echo "Installing Docker... " diff --git a/src/modules/adsb-feeder/start_chroot_script b/src/modules/adsb-feeder/start_chroot_script index fab50d6f..def5c9cd 100644 --- a/src/modules/adsb-feeder/start_chroot_script +++ b/src/modules/adsb-feeder/start_chroot_script @@ -76,7 +76,12 @@ echo "_ADSBIM_CONTAINER_VERSION=$(cat /opt/adsb/adsb.im.version)" >> "$ENV_FILE" rm -f /boot/ADSB-README.txt # Install dependencies -apt-get install -y gnupg hostapd isc-dhcp-server avahi-utils +apt-get install -y \ + gnupg hostapd isc-dhcp-server avahi-utils \ + git rtl-sdr \ + apt-transport-https ca-certificates curl gnupg2 \ + slirp4netns uidmap jq zstd netcat-openbsd + systemctl mask hostapd.service systemctl mask isc-dhcp-server.service