From 49068064e4017cfde9060134c333e3ac2e16676f Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 4 Feb 2016 16:22:23 +0100 Subject: [PATCH] dont try to install journald driver on wheezy Signed-off-by: Sebastiaan van Stijn Signed-off-by: Jessica Frazelle Upstream-commit: 6c2b014d5e3d4a6eb37df0edc1fc552b05406ede Component: engine --- .../engine/contrib/builder/deb/amd64/debian-wheezy/Dockerfile | 2 +- components/engine/contrib/builder/deb/amd64/generate.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/engine/contrib/builder/deb/amd64/debian-wheezy/Dockerfile b/components/engine/contrib/builder/deb/amd64/debian-wheezy/Dockerfile index 77d4cb6ad4..d7ea3c14ba 100644 --- a/components/engine/contrib/builder/deb/amd64/debian-wheezy/Dockerfile +++ b/components/engine/contrib/builder/deb/amd64/debian-wheezy/Dockerfile @@ -4,7 +4,7 @@ FROM debian:wheezy-backports -RUN apt-get update && apt-get install -y -t wheezy-backports btrfs-tools libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* +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/* ENV GO_VERSION 1.5.3 diff --git a/components/engine/contrib/builder/deb/amd64/generate.sh b/components/engine/contrib/builder/deb/amd64/generate.sh index 0a0561a643..8b4f7d2f8d 100755 --- a/components/engine/contrib/builder/deb/amd64/generate.sh +++ b/components/engine/contrib/builder/deb/amd64/generate.sh @@ -63,7 +63,7 @@ for version in "${versions[@]}"; do ) # packaging for "sd-journal.h" and libraries varies case "$suite" in - precise) ;; + precise|wheezy) ;; sid|stretch|wily) packages+=( libsystemd-dev );; *) packages+=( libsystemd-journal-dev );; esac