Browse code
Merge pull request #32520 from thaJeztah/remove-ubuntu-12.04-precise
Remove Ubuntu 12.04 "precise pangolin" from build scripts
Vincent Demeester authored on 2017/04/12 01:05:18Showing 3 changed files
- contrib/builder/deb/amd64/generate.sh
- contrib/builder/deb/amd64/ubuntu-precise/Dockerfile
- contrib/builder/deb/armhf/generate.sh
| ... | ... |
@@ -81,15 +81,15 @@ for version in "${versions[@]}"; do
|
| 81 | 81 |
) |
| 82 | 82 |
# packaging for "sd-journal.h" and libraries varies |
| 83 | 83 |
case "$suite" in |
| 84 |
- precise|wheezy) ;; |
|
| 85 |
- jessie|trusty) packages+=( libsystemd-journal-dev );; |
|
| 86 |
- *) packages+=( libsystemd-dev );; |
|
| 84 |
+ wheezy) ;; |
|
| 85 |
+ jessie|trusty) packages+=( libsystemd-journal-dev ) ;; |
|
| 86 |
+ *) packages+=( libsystemd-dev ) ;; |
|
| 87 | 87 |
esac |
| 88 | 88 |
|
| 89 |
- # debian wheezy & ubuntu precise do not have the right libseccomp libs |
|
| 89 |
+ # debian wheezy does not have the right libseccomp libs |
|
| 90 | 90 |
# debian jessie & ubuntu trusty have a libseccomp < 2.2.1 :( |
| 91 | 91 |
case "$suite" in |
| 92 |
- precise|wheezy|jessie|trusty) |
|
| 92 |
+ wheezy|jessie|trusty) |
|
| 93 | 93 |
packages=( "${packages[@]/libseccomp-dev}" )
|
| 94 | 94 |
runcBuildTags="apparmor selinux" |
| 95 | 95 |
;; |
| ... | ... |
@@ -99,23 +99,6 @@ for version in "${versions[@]}"; do
|
| 99 | 99 |
;; |
| 100 | 100 |
esac |
| 101 | 101 |
|
| 102 |
- |
|
| 103 |
- if [ "$suite" = 'precise' ]; then |
|
| 104 |
- # precise has a few package issues |
|
| 105 |
- |
|
| 106 |
- # - dh-systemd doesn't exist at all |
|
| 107 |
- packages=( "${packages[@]/dh-systemd}" )
|
|
| 108 |
- |
|
| 109 |
- # - libdevmapper-dev is missing critical structs (too old) |
|
| 110 |
- packages=( "${packages[@]/libdevmapper-dev}" )
|
|
| 111 |
- extraBuildTags+=' exclude_graphdriver_devicemapper' |
|
| 112 |
- |
|
| 113 |
- # - btrfs-tools is missing "ioctl.h" (too old), so it's useless |
|
| 114 |
- # (since kernels on precise are old too, just skip btrfs entirely) |
|
| 115 |
- packages=( "${packages[@]/btrfs-tools}" )
|
|
| 116 |
- extraBuildTags+=' exclude_graphdriver_btrfs' |
|
| 117 |
- fi |
|
| 118 |
- |
|
| 119 | 102 |
if [ "$suite" = 'wheezy' ]; then |
| 120 | 103 |
# pull a couple packages from backports explicitly |
| 121 | 104 |
# (build failures otherwise) |
| 122 | 105 |
deleted file mode 100644 |
| ... | ... |
@@ -1,16 +0,0 @@ |
| 1 |
-# |
|
| 2 |
-# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/amd64/generate.sh"! |
|
| 3 |
-# |
|
| 4 |
- |
|
| 5 |
-FROM ubuntu:precise |
|
| 6 |
- |
|
| 7 |
-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/* |
|
| 8 |
- |
|
| 9 |
-ENV GO_VERSION 1.7.5 |
|
| 10 |
-RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
|
|
| 11 |
-ENV PATH $PATH:/usr/local/go/bin |
|
| 12 |
- |
|
| 13 |
-ENV AUTO_GOPATH 1 |
|
| 14 |
- |
|
| 15 |
-ENV DOCKER_BUILDTAGS apparmor exclude_graphdriver_btrfs exclude_graphdriver_devicemapper pkcs11 selinux |
|
| 16 |
-ENV RUNC_BUILDTAGS apparmor selinux |
| ... | ... |
@@ -83,15 +83,15 @@ for version in "${versions[@]}"; do
|
| 83 | 83 |
) |
| 84 | 84 |
# packaging for "sd-journal.h" and libraries varies |
| 85 | 85 |
case "$suite" in |
| 86 |
- precise|wheezy) ;; |
|
| 87 |
- jessie|trusty) packages+=( libsystemd-journal-dev );; |
|
| 88 |
- *) packages+=( libsystemd-dev );; |
|
| 86 |
+ wheezy) ;; |
|
| 87 |
+ jessie|trusty) packages+=( libsystemd-journal-dev ) ;; |
|
| 88 |
+ *) packages+=( libsystemd-dev ) ;; |
|
| 89 | 89 |
esac |
| 90 | 90 |
|
| 91 |
- # debian wheezy & ubuntu precise do not have the right libseccomp libs |
|
| 91 |
+ # debian wheezy does not have the right libseccomp libs |
|
| 92 | 92 |
# debian jessie & ubuntu trusty have a libseccomp < 2.2.1 :( |
| 93 | 93 |
case "$suite" in |
| 94 |
- precise|wheezy|jessie|trusty) |
|
| 94 |
+ wheezy|jessie|trusty) |
|
| 95 | 95 |
packages=( "${packages[@]/libseccomp-dev}" )
|
| 96 | 96 |
runcBuildTags="apparmor selinux" |
| 97 | 97 |
;; |
| ... | ... |
@@ -101,23 +101,6 @@ for version in "${versions[@]}"; do
|
| 101 | 101 |
;; |
| 102 | 102 |
esac |
| 103 | 103 |
|
| 104 |
- |
|
| 105 |
- if [ "$suite" = 'precise' ]; then |
|
| 106 |
- # precise has a few package issues |
|
| 107 |
- |
|
| 108 |
- # - dh-systemd doesn't exist at all |
|
| 109 |
- packages=( "${packages[@]/dh-systemd}" )
|
|
| 110 |
- |
|
| 111 |
- # - libdevmapper-dev is missing critical structs (too old) |
|
| 112 |
- packages=( "${packages[@]/libdevmapper-dev}" )
|
|
| 113 |
- extraBuildTags+=' exclude_graphdriver_devicemapper' |
|
| 114 |
- |
|
| 115 |
- # - btrfs-tools is missing "ioctl.h" (too old), so it's useless |
|
| 116 |
- # (since kernels on precise are old too, just skip btrfs entirely) |
|
| 117 |
- packages=( "${packages[@]/btrfs-tools}" )
|
|
| 118 |
- extraBuildTags+=' exclude_graphdriver_btrfs' |
|
| 119 |
- fi |
|
| 120 |
- |
|
| 121 | 104 |
if [ "$suite" = 'wheezy' ]; then |
| 122 | 105 |
# pull a couple packages from backports explicitly |
| 123 | 106 |
# (build failures otherwise) |