Signed-off-by: Jessica Frazelle <acidburn@docker.com>
| ... | ... |
@@ -25,22 +25,7 @@ mkdir -p "$APTDIR/conf" "$APTDIR/db" |
| 25 | 25 |
arches=( amd64 i386 ) |
| 26 | 26 |
components=( main testing experimental ) |
| 27 | 27 |
|
| 28 |
-# create/update distributions file |
|
| 29 |
-if [ ! -f "$APTDIR/conf/distributions" ]; then |
|
| 30 |
- for suite in $(exec contrib/reprepro/suites.sh); do |
|
| 31 |
- cat <<-EOF |
|
| 32 |
- Origin: Docker |
|
| 33 |
- Suite: $suite |
|
| 34 |
- Codename: $suite |
|
| 35 |
- Architectures: ${arches[*]}
|
|
| 36 |
- Components: ${components[*]}
|
|
| 37 |
- Description: Docker APT Repository |
|
| 38 |
- |
|
| 39 |
- EOF |
|
| 40 |
- done > "$APTDIR/conf/distributions" |
|
| 41 |
-fi |
|
| 42 |
- |
|
| 43 |
-# create/update distributions file |
|
| 28 |
+# create/update apt-ftparchive file |
|
| 44 | 29 |
if [ ! -f "$APTDIR/conf/apt-ftparchive.conf" ]; then |
| 45 | 30 |
cat <<-EOF > "$APTDIR/conf/apt-ftparchive.conf" |
| 46 | 31 |
Dir {
|
| ... | ... |
@@ -85,20 +70,15 @@ if [ ! -f "$APTDIR/conf/docker-engine-release.conf" ]; then |
| 85 | 85 |
EOF |
| 86 | 86 |
fi |
| 87 | 87 |
|
| 88 |
-# set the component and priority for the version being released |
|
| 88 |
+# set the component for the version being released |
|
| 89 | 89 |
component="main" |
| 90 |
-priority=700 |
|
| 91 |
-options="--keepunreferencedfiles" |
|
| 92 | 90 |
|
| 93 | 91 |
if [[ "$VERSION" == *-rc* ]]; then |
| 94 | 92 |
component="testing" |
| 95 |
- priority=650 |
|
| 96 | 93 |
fi |
| 97 | 94 |
|
| 98 | 95 |
if [ $DOCKER_EXPERIMENTAL ] || [[ "$VERSION" == *-dev ]] || [ -n "$(git status --porcelain)" ]; then |
| 99 | 96 |
component="experimental" |
| 100 |
- priority=600 |
|
| 101 |
- options= |
|
| 102 | 97 |
fi |
| 103 | 98 |
|
| 104 | 99 |
# release the debs |
| ... | ... |
@@ -130,7 +110,7 @@ apt-ftparchive generate "$APTDIR/conf/apt-ftparchive.conf" |
| 130 | 130 |
|
| 131 | 131 |
for dir in contrib/builder/deb/*/; do |
| 132 | 132 |
version="$(basename "$dir")" |
| 133 |
- codename="${version//debootstrap-}"
|
|
| 133 |
+ codename="${version//debootstrap-}"
|
|
| 134 | 134 |
|
| 135 | 135 |
apt-ftparchive \ |
| 136 | 136 |
-o "APT::FTPArchive::Release::Codename=$codename" \ |