toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #19999 from thaJeztah/carry-19668-wheezy-journald

Browse Source 
(carry 19668) don't try to install journald driver on wheezy
Upstream-commit: a1b07a8010d23dbb1edcb88cbe2e38081ff93a3a
Component: engine
This commit is contained in:
Jess Frazelle
2016-02-04 07:44:42 -08:00
parent 76c413d163 49068064e4
commit 2a6e6c3500
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/contrib/builder/deb/amd64/debian-wheezy/Dockerfile
View File

@ -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

2
components/engine/contrib/builder/deb/amd64/generate.sh
View File

@ -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