0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove Ubuntu 12.04 "precise pangolin" from build scripts

Browse source 
Ubuntu 12.04 will be EOL on April 28, after which it won't
receive updates and security fixes;
https://lists.ubuntu.com/archives/ubuntu-announce/2017-March/000218.html

This patch removes Ubuntu 12.04 from the build scripts

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2017-04-11 14:05:17 +02:00
parent a258ef58d8
commit 618d6bd0ce
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
3 changed files with 10 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
contrib/builder/deb/amd64/generate.sh
View file

@ -81,15 +81,15 @@ for version in "${versions[@]}"; do
) )
# packaging for "sd-journal.h" and libraries varies # packaging for "sd-journal.h" and libraries varies
case "$suite" in case "$suite" in
precise|wheezy) ;; wheezy) ;;
jessie|trusty) packages+=( libsystemd-journal-dev );; jessie|trusty) packages+=( libsystemd-journal-dev ) ;;
*) packages+=( libsystemd-dev );; *) packages+=( libsystemd-dev ) ;;
esac esac
# debian wheezy & ubuntu precise do not have the right libseccomp libs # debian wheezy does not have the right libseccomp libs
# debian jessie & ubuntu trusty have a libseccomp < 2.2.1 :( # debian jessie & ubuntu trusty have a libseccomp < 2.2.1 :(
case "$suite" in case "$suite" in
precise|wheezy|jessie|trusty) wheezy|jessie|trusty)
packages=( "${packages[@]/libseccomp-dev}" ) packages=( "${packages[@]/libseccomp-dev}" )
runcBuildTags="apparmor selinux" runcBuildTags="apparmor selinux"
;; ;;
@ -99,23 +99,6 @@ for version in "${versions[@]}"; do
;; ;;
esac esac
if [ "$suite" = 'precise' ]; then
# precise has a few package issues
# - dh-systemd doesn't exist at all
packages=( "${packages[@]/dh-systemd}" )
# - libdevmapper-dev is missing critical structs (too old)
packages=( "${packages[@]/libdevmapper-dev}" )
extraBuildTags+=' exclude_graphdriver_devicemapper'
# - btrfs-tools is missing "ioctl.h" (too old), so it's useless
# (since kernels on precise are old too, just skip btrfs entirely)
packages=( "${packages[@]/btrfs-tools}" )
extraBuildTags+=' exclude_graphdriver_btrfs'
fi
if [ "$suite" = 'wheezy' ]; then if [ "$suite" = 'wheezy' ]; then
# pull a couple packages from backports explicitly # pull a couple packages from backports explicitly
# (build failures otherwise) # (build failures otherwise)

16
contrib/builder/deb/amd64/ubuntu-precise/Dockerfile
View file

@ -1,16 +0,0 @@
#
# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/amd64/generate.sh"!
#
FROM ubuntu:precise
RUN apt-get update && apt-get install -y apparmor bash-completion build-essential cmake curl ca-certificates debhelper dh-apparmor git libapparmor-dev libltdl-dev pkg-config vim-common --no-install-recommends && rm -rf /var/lib/apt/lists/*
ENV GO_VERSION 1.7.5
RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
ENV PATH $PATH:/usr/local/go/bin
ENV AUTO_GOPATH 1
ENV DOCKER_BUILDTAGS apparmor exclude_graphdriver_btrfs exclude_graphdriver_devicemapper pkcs11 selinux
ENV RUNC_BUILDTAGS apparmor selinux

27
contrib/builder/deb/armhf/generate.sh
View file

@ -83,15 +83,15 @@ for version in "${versions[@]}"; do
) )
# packaging for "sd-journal.h" and libraries varies # packaging for "sd-journal.h" and libraries varies
case "$suite" in case "$suite" in
precise|wheezy) ;; wheezy) ;;
jessie|trusty) packages+=( libsystemd-journal-dev );; jessie|trusty) packages+=( libsystemd-journal-dev ) ;;
*) packages+=( libsystemd-dev );; *) packages+=( libsystemd-dev ) ;;
esac esac
# debian wheezy & ubuntu precise do not have the right libseccomp libs # debian wheezy does not have the right libseccomp libs
# debian jessie & ubuntu trusty have a libseccomp < 2.2.1 :( # debian jessie & ubuntu trusty have a libseccomp < 2.2.1 :(
case "$suite" in case "$suite" in
precise|wheezy|jessie|trusty) wheezy|jessie|trusty)
packages=( "${packages[@]/libseccomp-dev}" ) packages=( "${packages[@]/libseccomp-dev}" )
runcBuildTags="apparmor selinux" runcBuildTags="apparmor selinux"
;; ;;
@ -101,23 +101,6 @@ for version in "${versions[@]}"; do
;; ;;
esac esac
if [ "$suite" = 'precise' ]; then
# precise has a few package issues
# - dh-systemd doesn't exist at all
packages=( "${packages[@]/dh-systemd}" )
# - libdevmapper-dev is missing critical structs (too old)
packages=( "${packages[@]/libdevmapper-dev}" )
extraBuildTags+=' exclude_graphdriver_devicemapper'
# - btrfs-tools is missing "ioctl.h" (too old), so it's useless
# (since kernels on precise are old too, just skip btrfs entirely)
packages=( "${packages[@]/btrfs-tools}" )
extraBuildTags+=' exclude_graphdriver_btrfs'
fi
if [ "$suite" = 'wheezy' ]; then if [ "$suite" = 'wheezy' ]; then
# pull a couple packages from backports explicitly # pull a couple packages from backports explicitly
# (build failures otherwise) # (build failures otherwise)