From f5afe02b695c7c286f035087cb645efcf69ffcd3 Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Fri, 5 Feb 2016 15:31:12 -0800 Subject: [PATCH] fix deb generate Signed-off-by: Jessica Frazelle --- contrib/builder/deb/amd64/debian-wheezy/Dockerfile | 2 +- contrib/builder/deb/amd64/generate.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/builder/deb/amd64/debian-wheezy/Dockerfile b/contrib/builder/deb/amd64/debian-wheezy/Dockerfile index d7ea3c14ba..bc1028a0f1 100644 --- a/contrib/builder/deb/amd64/debian-wheezy/Dockerfile +++ b/contrib/builder/deb/amd64/debian-wheezy/Dockerfile @@ -5,7 +5,7 @@ FROM debian:wheezy-backports RUN apt-get update && apt-get install -y -t wheezy-backports btrfs-tools --no-install-recommends && rm -rf /var/lib/apt/lists/* -RUN apt-get update && apt-get install -y apparmor bash-completion build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev pkg-config --no-install-recommends && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y apparmor bash-completion build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev pkg-config --no-install-recommends && rm -rf /var/lib/apt/lists/* ENV GO_VERSION 1.5.3 RUN curl -fSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local diff --git a/contrib/builder/deb/amd64/generate.sh b/contrib/builder/deb/amd64/generate.sh index 8b4f7d2f8d..9974aef345 100755 --- a/contrib/builder/deb/amd64/generate.sh +++ b/contrib/builder/deb/amd64/generate.sh @@ -99,7 +99,7 @@ for version in "${versions[@]}"; do if [ "$suite" = 'wheezy' ]; then # pull a couple packages from backports explicitly # (build failures otherwise) - backportsPackages=( btrfs-tools libsystemd-journal-dev ) + backportsPackages=( btrfs-tools ) for pkg in "${backportsPackages[@]}"; do packages=( "${packages[@]/$pkg}" ) done