Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
| ... | ... |
@@ -28,13 +28,13 @@ shift |
| 28 | 28 |
# prevent init scripts from running during install/update |
| 29 | 29 |
echo >&2 "+ echo exit 101 > '$rootfsDir/usr/sbin/policy-rc.d'" |
| 30 | 30 |
cat > "$rootfsDir/usr/sbin/policy-rc.d" <<'EOF' |
| 31 |
-#!/bin/sh |
|
| 31 |
+ #!/bin/sh |
|
| 32 | 32 |
|
| 33 |
-# For most Docker users, "apt-get install" only happens during "docker build", |
|
| 34 |
-# where starting services doesn't work and often fails in humorous ways. This |
|
| 35 |
-# prevents those failures by stopping the services from attempting to start. |
|
| 33 |
+ # For most Docker users, "apt-get install" only happens during "docker build", |
|
| 34 |
+ # where starting services doesn't work and often fails in humorous ways. This |
|
| 35 |
+ # prevents those failures by stopping the services from attempting to start. |
|
| 36 | 36 |
|
| 37 |
-exit 101 |
|
| 37 |
+ exit 101 |
|
| 38 | 38 |
EOF |
| 39 | 39 |
chmod +x "$rootfsDir/usr/sbin/policy-rc.d" |
| 40 | 40 |
|
| ... | ... |
@@ -59,12 +59,12 @@ if strings "$rootfsDir/usr/bin/dpkg" | grep -q unsafe-io; then |
| 59 | 59 |
# force dpkg not to call sync() after package extraction (speeding up installs) |
| 60 | 60 |
echo >&2 "+ echo force-unsafe-io > '$rootfsDir/etc/dpkg/dpkg.cfg.d/docker-apt-speedup'" |
| 61 | 61 |
cat > "$rootfsDir/etc/dpkg/dpkg.cfg.d/docker-apt-speedup" <<-'EOF' |
| 62 |
- # For most Docker users, package installs happen during "docker build", which |
|
| 63 |
- # doesn't survive power loss and gets restarted clean afterwards anyhow, so |
|
| 64 |
- # this minor tweak gives us a nice speedup (much nicer on spinning disks, |
|
| 65 |
- # obviously). |
|
| 62 |
+ # For most Docker users, package installs happen during "docker build", which |
|
| 63 |
+ # doesn't survive power loss and gets restarted clean afterwards anyhow, so |
|
| 64 |
+ # this minor tweak gives us a nice speedup (much nicer on spinning disks, |
|
| 65 |
+ # obviously). |
|
| 66 | 66 |
|
| 67 |
- force-unsafe-io |
|
| 67 |
+ force-unsafe-io |
|
| 68 | 68 |
EOF |
| 69 | 69 |
fi |
| 70 | 70 |
|
| ... | ... |
@@ -97,26 +97,26 @@ if [ -d "$rootfsDir/etc/apt/apt.conf.d" ]; then |
| 97 | 97 |
# remove apt-cache translations for fast "apt-get update" |
| 98 | 98 |
echo >&2 "+ echo Acquire::Languages 'none' > '$rootfsDir/etc/apt/apt.conf.d/docker-no-languages'" |
| 99 | 99 |
cat > "$rootfsDir/etc/apt/apt.conf.d/docker-no-languages" <<-'EOF' |
| 100 |
- # In Docker, we don't often need the "Translations" files, so we're just wasting |
|
| 101 |
- # time and space by downloading them, and this inhibits that. For users that do |
|
| 102 |
- # need them, it's a simple matter to delete this file and "apt-get update". :) |
|
| 100 |
+ # In Docker, we don't often need the "Translations" files, so we're just wasting |
|
| 101 |
+ # time and space by downloading them, and this inhibits that. For users that do |
|
| 102 |
+ # need them, it's a simple matter to delete this file and "apt-get update". :) |
|
| 103 | 103 |
|
| 104 |
- Acquire::Languages "none"; |
|
| 104 |
+ Acquire::Languages "none"; |
|
| 105 | 105 |
EOF |
| 106 | 106 |
|
| 107 | 107 |
echo >&2 "+ echo Acquire::GzipIndexes 'true' > '$rootfsDir/etc/apt/apt.conf.d/docker-gzip-indexes'" |
| 108 | 108 |
cat > "$rootfsDir/etc/apt/apt.conf.d/docker-gzip-indexes" <<-'EOF' |
| 109 |
- # Since Docker users using "RUN apt-get update && apt-get install -y ..." in |
|
| 110 |
- # their Dockerfiles don't go delete the lists files afterwards, we want them to |
|
| 111 |
- # be as small as possible on-disk, so we explicitly request "gz" versions and |
|
| 112 |
- # tell Apt to keep them gzipped on-disk. |
|
| 109 |
+ # Since Docker users using "RUN apt-get update && apt-get install -y ..." in |
|
| 110 |
+ # their Dockerfiles don't go delete the lists files afterwards, we want them to |
|
| 111 |
+ # be as small as possible on-disk, so we explicitly request "gz" versions and |
|
| 112 |
+ # tell Apt to keep them gzipped on-disk. |
|
| 113 | 113 |
|
| 114 |
- # For comparison, an "apt-get update" layer without this on a pristine |
|
| 115 |
- # "debian:wheezy" base image was "29.88 MB", where with this it was only |
|
| 116 |
- # "8.273 MB". |
|
| 114 |
+ # For comparison, an "apt-get update" layer without this on a pristine |
|
| 115 |
+ # "debian:wheezy" base image was "29.88 MB", where with this it was only |
|
| 116 |
+ # "8.273 MB". |
|
| 117 | 117 |
|
| 118 |
- Acquire::GzipIndexes "true"; |
|
| 119 |
- Acquire::CompressionTypes::Order:: "gz"; |
|
| 118 |
+ Acquire::GzipIndexes "true"; |
|
| 119 |
+ Acquire::CompressionTypes::Order:: "gz"; |
|
| 120 | 120 |
EOF |
| 121 | 121 |
fi |
| 122 | 122 |
|