This is to especially fix FPM 1.0+ complaining that we told it we have an /etc/default/docker "config file", but didn't actually include one.
Tianon Gravi authored on 2014/01/02 14:34:22... | ... |
@@ -72,7 +72,7 @@ RUN cd /usr/local/go/src && bash -xc 'for platform in $DOCKER_CROSSPLATFORMS; do |
72 | 72 |
RUN go get code.google.com/p/go.tools/cmd/cover |
73 | 73 |
|
74 | 74 |
# TODO replace FPM with some very minimal debhelper stuff |
75 |
-RUN gem install --no-rdoc --no-ri fpm |
|
75 |
+RUN gem install --no-rdoc --no-ri fpm --version 1.0.1 |
|
76 | 76 |
|
77 | 77 |
# Setup s3cmd config |
78 | 78 |
RUN /bin/echo -e '[default]\naccess_key=$AWS_ACCESS_KEY\nsecret_key=$AWS_SECRET_KEY' > /.s3cfg |
... | ... |
@@ -31,6 +31,20 @@ bundle_ubuntu() { |
31 | 31 |
mkdir -p $DIR/lib/systemd |
32 | 32 |
cp -R contrib/init/systemd $DIR/lib/systemd/system |
33 | 33 |
|
34 |
+ mkdir -p $DIR/etc/default |
|
35 |
+ cat > $DIR/etc/default/docker <<'EOF' |
|
36 |
+# Docker Upstart and SysVinit configuration file |
|
37 |
+ |
|
38 |
+# Customize location of Docker binary (especially for development testing). |
|
39 |
+#DOCKER="/usr/local/bin/docker" |
|
40 |
+ |
|
41 |
+# Use DOCKER_OPTS to modify the daemon startup options. |
|
42 |
+#DOCKER_OPTS="-dns 8.8.8.8" |
|
43 |
+ |
|
44 |
+# If you need Docker to use an HTTP proxy, it can also be specified here. |
|
45 |
+#export http_proxy=http://127.0.0.1:3128/ |
|
46 |
+EOF |
|
47 |
+ |
|
34 | 48 |
# Copy the binary |
35 | 49 |
# This will fail if the binary bundle hasn't been built |
36 | 50 |
mkdir -p $DIR/usr/bin |
... | ... |
@@ -120,12 +134,8 @@ EOF |
120 | 120 |
--maintainer "$PACKAGE_MAINTAINER" \ |
121 | 121 |
--url "$PACKAGE_URL" \ |
122 | 122 |
--license "$PACKAGE_LICENSE" \ |
123 |
- --config-files /etc/init/docker.conf \ |
|
124 |
- --config-files /etc/init.d/docker \ |
|
125 |
- --config-files /etc/default/docker \ |
|
126 | 123 |
--deb-compression xz \ |
127 | 124 |
-t deb . |
128 |
- # note: the --config-files lines have to be duplicated to stop overwrite on package upgrade (since we have to use this funky virtual package) |
|
129 | 125 |
) |
130 | 126 |
} |
131 | 127 |
|