From ff8d247c2f3fdea49dfcbfeee458620a9c943c7b Mon Sep 17 00:00:00 2001 From: Calin Culianu Date: Thu, 26 Aug 2021 14:30:06 +0300 Subject: [PATCH] Allow for using docker with macOS We remove the local debian cache stuff since it doesn't work on a docker container running on a macOS host. --- bin/make-base-vm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/bin/make-base-vm b/bin/make-base-vm index 30e4fbf..c38d687 100755 --- a/bin/make-base-vm +++ b/bin/make-base-vm @@ -193,12 +193,21 @@ if [ $DOCKER = "1" ]; then base_image="$DISTRO:$SUITE" fi + if [ $(uname) != "Darwin" ]; then + CACHELINE=$(cat << EOF0 +RUN echo 'Acquire::http { Proxy "$MIRROR_BASE"; };' > /etc/apt/apt.conf.d/50cacher +EOF0 +) + else + # MacOS, no local debian cache + CACHELINE="" + fi # Generate the dockerfile cat << EOF > $OUT.Dockerfile FROM $base_image ENV DEBIAN_FRONTEND=noninteractive -RUN echo 'Acquire::http { Proxy "$MIRROR_BASE"; };' > /etc/apt/apt.conf.d/50cacher +$CACHELINE RUN apt-get update && apt-get --no-install-recommends -y install $addpkg RUN useradd -ms /bin/bash -U $DISTRO