mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Always create apt-ftparchive.conf.
The Releases file(s) and other bits for EOL-ed distros such as Ubuntu
Vivid should remain untouched when we are releasing debs.
However, few files in https://apt.dockerproject.org/repo/dists/ubuntu-vivid/
were being updated for the docker 1.10 release including the Release files.
This is due to apt-ftparchive generating index files for vivid as well,
due to the stale apt-ftparchive.conf
This change always creates config using suites in contrib/reprepro/suites.sh.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
(cherry picked from commit 204c7808f9
)
This commit is contained in:
parent
11a8469e49
commit
97e7e233b6
1 changed files with 32 additions and 32 deletions
|
@ -47,41 +47,41 @@ if [[ ! "${components[*]}" =~ $component ]] ; then
|
||||||
components+=( $component )
|
components+=( $component )
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# create/update apt-ftparchive file
|
# create apt-ftparchive file on every run. This is essential to avoid
|
||||||
if [ ! -f "$APTDIR/conf/apt-ftparchive.conf" ]; then
|
# using stale versions of the config file that could cause unnecessary
|
||||||
cat <<-EOF > "$APTDIR/conf/apt-ftparchive.conf"
|
# refreshing of bits for EOL-ed releases.
|
||||||
Dir {
|
cat <<-EOF > "$APTDIR/conf/apt-ftparchive.conf"
|
||||||
ArchiveDir "${APTDIR}";
|
Dir {
|
||||||
CacheDir "${APTDIR}/db";
|
ArchiveDir "${APTDIR}";
|
||||||
};
|
CacheDir "${APTDIR}/db";
|
||||||
|
};
|
||||||
|
|
||||||
Default {
|
Default {
|
||||||
Packages::Compress ". gzip bzip2";
|
Packages::Compress ". gzip bzip2";
|
||||||
Sources::Compress ". gzip bzip2";
|
Sources::Compress ". gzip bzip2";
|
||||||
Contents::Compress ". gzip bzip2";
|
Contents::Compress ". gzip bzip2";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
TreeDefault {
|
||||||
|
BinCacheDB "packages-\$(SECTION)-\$(ARCH).db";
|
||||||
|
Directory "pool/\$(SECTION)";
|
||||||
|
Packages "\$(DIST)/\$(SECTION)/binary-\$(ARCH)/Packages";
|
||||||
|
SrcDirectory "pool/\$(SECTION)";
|
||||||
|
Sources "\$(DIST)/\$(SECTION)/source/Sources";
|
||||||
|
Contents "\$(DIST)/\$(SECTION)/Contents-\$(ARCH)";
|
||||||
|
FileList "$APTDIR/\$(DIST)/\$(SECTION)/filelist";
|
||||||
|
};
|
||||||
|
EOF
|
||||||
|
|
||||||
|
for suite in $(exec contrib/reprepro/suites.sh); do
|
||||||
|
cat <<-EOF
|
||||||
|
Tree "dists/${suite}" {
|
||||||
|
Sections "${components[*]}";
|
||||||
|
Architectures "${arches[*]}";
|
||||||
|
}
|
||||||
|
|
||||||
TreeDefault {
|
|
||||||
BinCacheDB "packages-\$(SECTION)-\$(ARCH).db";
|
|
||||||
Directory "pool/\$(SECTION)";
|
|
||||||
Packages "\$(DIST)/\$(SECTION)/binary-\$(ARCH)/Packages";
|
|
||||||
SrcDirectory "pool/\$(SECTION)";
|
|
||||||
Sources "\$(DIST)/\$(SECTION)/source/Sources";
|
|
||||||
Contents "\$(DIST)/\$(SECTION)/Contents-\$(ARCH)";
|
|
||||||
FileList "$APTDIR/\$(DIST)/\$(SECTION)/filelist";
|
|
||||||
};
|
|
||||||
EOF
|
EOF
|
||||||
|
done >> "$APTDIR/conf/apt-ftparchive.conf"
|
||||||
for suite in $(exec contrib/reprepro/suites.sh); do
|
|
||||||
cat <<-EOF
|
|
||||||
Tree "dists/${suite}" {
|
|
||||||
Sections "${components[*]}";
|
|
||||||
Architectures "${arches[*]}";
|
|
||||||
}
|
|
||||||
|
|
||||||
EOF
|
|
||||||
done >> "$APTDIR/conf/apt-ftparchive.conf"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -f "$APTDIR/conf/docker-engine-release.conf" ]; then
|
if [ ! -f "$APTDIR/conf/docker-engine-release.conf" ]; then
|
||||||
cat <<-EOF > "$APTDIR/conf/docker-engine-release.conf"
|
cat <<-EOF > "$APTDIR/conf/docker-engine-release.conf"
|
||||||
|
|
Loading…
Add table
Reference in a new issue