소스 검색

Merge pull request #22606 from mlaventure/allow-changing-wheezy-backport-mirror

Allow changing wheezy deb builder backport mirror
Tibor Vass 9 년 전
부모
커밋
9ffd2652e2
2개의 변경된 파일9개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 0
      contrib/builder/deb/amd64/debian-wheezy/Dockerfile
  2. 8 1
      contrib/builder/deb/amd64/generate.sh

+ 1 - 0
contrib/builder/deb/amd64/debian-wheezy/Dockerfile

@@ -7,6 +7,7 @@ FROM debian:wheezy-backports
 # allow replacing httpredir mirror
 ARG APT_MIRROR=httpredir.debian.org
 RUN sed -i s/httpredir.debian.org/$APT_MIRROR/g /etc/apt/sources.list
+RUN sed -i s/httpredir.debian.org/$APT_MIRROR/g /etc/apt/sources.list.d/backports.list
 
 RUN apt-get update && apt-get install -y -t wheezy-backports btrfs-tools --no-install-recommends && rm -rf /var/lib/apt/lists/*
 RUN apt-get update && apt-get install -y apparmor bash-completion  build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev  libsqlite3-dev pkg-config --no-install-recommends && rm -rf /var/lib/apt/lists/*

+ 8 - 1
contrib/builder/deb/amd64/generate.sh

@@ -46,8 +46,15 @@ for version in "${versions[@]}"; do
 			# allow replacing httpredir mirror
 			ARG APT_MIRROR=httpredir.debian.org
 			RUN sed -i s/httpredir.debian.org/$APT_MIRROR/g /etc/apt/sources.list
-
 		EOF
+
+		if [ "$suite" = "wheezy" ]; then
+			cat >> "$version/Dockerfile" <<-'EOF'
+				RUN sed -i s/httpredir.debian.org/$APT_MIRROR/g /etc/apt/sources.list.d/backports.list
+			EOF
+		fi
+
+		echo "" >> "$version/Dockerfile"
 	fi
 
 	extraBuildTags='pkcs11'