REMOVE apt-cacher build

Author: micaelmalta

bin/make-base-vm

@@ -103,7 +103,11 @@ if [ $# != 0 ] ; then
   done
 fi
 
-MIRROR_DEFAULT=127.0.0.1
+if [ $DOCKER = "1" ]; then
+  MIRROR_DEFAULT=172.17.0.1
+else
+  MIRROR_DEFAULT=127.0.0.1
+fi
 MIRROR_BASE=http://${MIRROR_HOST:-$MIRROR_DEFAULT}:3142
 
 if [ $DISTRO = "ubuntu" ]; then
@@ -176,26 +180,11 @@ fi
 removepkg=cron
 
 if [ $DOCKER = "1" ]; then
+
   addpkg=`echo $addpkg | tr ',' ' '`
 
   mkdir -p docker
   cd docker
-  export DOCKER_BUILDKIT=0
-
-  if [ ! "$(docker ps -q -f name=apt_cacher_ng)" ]; then
-    # Generate the dockerfile
-    cat << EOF > apt_cacher_ng.Dockerfile
-# syntax=docker/dockerfile:1
-FROM   ubuntu
-VOLUME ["/var/cache/apt-cacher-ng"]
-RUN    apt-get update && apt-get install -y apt-cacher-ng
-EXPOSE 3142
-CMD    chmod 777 /var/cache/apt-cacher-ng && /etc/init.d/apt-cacher-ng start && tail -f /var/log/apt-cacher-ng/*
-EOF
-
-    docker build --pull -f apt_cacher_ng.Dockerfile -t apt_cacher_ng .
-    docker run -d -p 3142:3142 --name apt_cacher_ng apt_cacher_ng
-  fi
 
   if [ -n "$DOCKER_IMAGE_HASH" ]; then
     base_image="$DISTRO@sha256:$DOCKER_IMAGE_HASH"
@@ -209,7 +198,8 @@ EOF
 FROM $base_image
 
 ENV DEBIAN_FRONTEND=noninteractive
-RUN rm /etc/apt/sources.list.d/*esm*.list &> /dev/null
+# DELETE ESM Files: W: Failed to fetch https://esm.ubuntu.com/ubuntu/dists/trusty-infra-security/main/binary-amd64/Packages  Received HTTP code 403 from proxy after CONNECT
+RUN [ -f /etc/apt/sources.list.d/*esm*.list ] && rm /etc/apt/sources.list.d/*esm*.list
 RUN echo 'Acquire::http { Proxy "$MIRROR_BASE"; };' > /etc/apt/apt.conf.d/50cacher
 RUN apt-get update && apt-get --no-install-recommends -y install $addpkg
 
@@ -220,7 +210,7 @@ WORKDIR /home/$DISTRO
 CMD ["sleep", "infinity"]
 EOF
 
-  docker build --network host --no-cache --pull -f $OUT.Dockerfile -t $OUT .
+  docker build --network host --pull -f $OUT.Dockerfile -t $OUT .
 
   exit 0
 fi