From 17e2946fdd71f55c326cf75053d4e030401adcfb Mon Sep 17 00:00:00 2001 From: Evan Krall Date: Thu, 9 Jan 2014 19:12:56 -0800 Subject: [PATCH] Use gzip compression in Ubuntu packages to make it at least possible to install on Lucid. Docker-DCO-1.1-Signed-off-by: Evan Krall (github: EvanKrall) Upstream-commit: c2a59dfe48e55bc93e3bed5ecde021f372151b09 Component: engine --- components/engine/Dockerfile | 2 +- components/engine/hack/make/ubuntu | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/engine/Dockerfile b/components/engine/Dockerfile index 9da4e8f039..3980f8713a 100644 --- a/components/engine/Dockerfile +++ b/components/engine/Dockerfile @@ -72,7 +72,7 @@ RUN cd /usr/local/go/src && bash -xc 'for platform in $DOCKER_CROSSPLATFORMS; do RUN go get code.google.com/p/go.tools/cmd/cover # TODO replace FPM with some very minimal debhelper stuff -RUN gem install --no-rdoc --no-ri fpm --version 1.0.1 +RUN gem install --no-rdoc --no-ri fpm --version 1.0.2 # Setup s3cmd config RUN /bin/echo -e '[default]\naccess_key=$AWS_ACCESS_KEY\nsecret_key=$AWS_SECRET_KEY' > /.s3cfg diff --git a/components/engine/hack/make/ubuntu b/components/engine/hack/make/ubuntu index bcffc6560f..6e130659d5 100644 --- a/components/engine/hack/make/ubuntu +++ b/components/engine/hack/make/ubuntu @@ -123,7 +123,7 @@ EOF --config-files /etc/init/docker.conf \ --config-files /etc/init.d/docker \ --config-files /etc/default/docker \ - --deb-compression xz \ + --deb-compression gz \ -t deb . mkdir empty fpm -s dir -C empty \ @@ -134,7 +134,7 @@ EOF --maintainer "$PACKAGE_MAINTAINER" \ --url "$PACKAGE_URL" \ --license "$PACKAGE_LICENSE" \ - --deb-compression xz \ + --deb-compression gz \ -t deb . ) }