FEAT: Disable APT-Cacher by default#249
Uh oh!
There was an error while loading. Please reload this page.
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -9,6 +9,7 @@ LXC=0 | ||
| VBOX=0 | ||
| DOCKER=0 | ||
| DOCKER_IMAGE_HASH="" | ||
| APT_CACHER_DEFAULT=0 | ||
| usage() { | ||
| echo "Usage: ${0##*/} [OPTION]..." | ||
| @@ -24,6 +25,7 @@ usage() { | ||
| --vbox use VirtualBox instead of kvm | ||
| --docker use docker instead of kvm | ||
| --docker-image-hash D digest of the docker image to build from | ||
| --enable-apt-cacher enable APT Cacher | ||
| The MIRROR_HOST environment variable can be used to change the | ||
| apt-cacher host. It should be something that both the host and the | ||
| @@ -88,6 +90,10 @@ if [ $# != 0 ] ; then | ||
| DOCKER=1 | ||
| shift 1 | ||
| ;; | ||
| --enable-apt-cacher) | ||
| APT_CACHER=1 | ||
| shift 1 | ||
| ;; | ||
| --docker-image-digest) | ||
| DOCKER_IMAGE_HASH="$2" | ||
| shift 2 | ||
| @@ -103,13 +109,11 @@ if [ $# != 0 ] ; then | ||
| done | ||
| fi | ||
| MIRROR_DEFAULT=127.0.0.1 | ||
| MIRROR_BASE=http://${MIRROR_HOST:-$MIRROR_DEFAULT}:3142 | ||
| APT_CACHER=${APT_CACHER:-$APT_CACHER_DEFAULT} | ||
| if [ $DISTRO = "ubuntu" ]; then | ||
| MIRROR=$MIRROR_BASE/archive.ubuntu.com/ubuntu | ||
| SECURITY_MIRROR=$MIRROR_BASE/security.ubuntu.com/ubuntu | ||
| @@ -193,12 +197,19 @@ if [ $DOCKER = "1" ]; then | ||
| base_image="$DISTRO:$SUITE" | ||
| fi | ||
| apt_cacher="" | ||
| if [ "$APT_CACHER" = 1 ]; then | ||
| apt_cacher="RUN echo 'Acquire::http { Proxy "$MIRROR_BASE"; };' > /etc/apt/apt.conf.d/50cacher" | ||
| fi | ||
| # Generate the dockerfile | ||
| cat << EOF > $OUT.Dockerfile | ||
| FROM $base_image | ||
| ENV DEBIAN_FRONTEND=noninteractive | ||
| # 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 | ||
| $apt_cacher | ||
| RUN apt-get update && apt-get --no-install-recommends -y install $addpkg | ||
| RUN useradd -ms /bin/bash -U $DISTRO | ||
| @@ -208,7 +219,7 @@ WORKDIR /home/$DISTRO | ||
| CMD ["sleep", "infinity"] | ||
| EOF | ||
| docker build --network host --pull -f $OUT.Dockerfile -t $OUT . | ||
There was a problem hiding this comment. unfortunately, this only works on Linux. if this is desired, it has to be behind a flag or a conditional based on the host OS. (this also relates to the change above, which points to 127.0.0.1 unconditionally) Contributor There was a problem hiding this comment. I will try to investigate the purpose of this, why he had to specify the host network and the relation with apt-cacher. Try to understand why he had to play with Contributor There was a problem hiding this comment. For now, if I'm right, it's related to the configuration of apt-cacher when you're using docker. He's just using adding conditionally the following line in gitian-builder/bin/make-base-vm Line 201 in 32b1145 So, I guess if mirrors configurations were working with apt-cacher before, not touching to those configurations when disabling apt-cacher shouldn't be a problem ? Would keeping | ||
| exit 0 | ||
| fi | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This line introduces a syntax error when using apt-cacher.
Within the
50cacherfile of the Dockerfile, will render :instead of
Need to escape quotes :
{ Proxy \"$MIRROR_BASE\"; }.Fixed in 525e33a