diff --git a/contrib/builder/deb/generate.sh b/contrib/builder/deb/generate.sh index 18d075204f..f9c4f21950 100755 --- a/contrib/builder/deb/generate.sh +++ b/contrib/builder/deb/generate.sh @@ -104,11 +104,11 @@ for version in "${versions[@]}"; do echo >> "$version/Dockerfile" - # debian jessie & ubuntu trusty/vivid do not have a libseccomp.a for compiling static dockerinit + # debian jessie & ubuntu trusty do not have a libseccomp.a for compiling static dockerinit # ONLY install libseccomp.a from source, this can be removed once dockerinit is removed # TODO remove this manual seccomp compilation once dockerinit is gone or no longer needs to be statically compiled case "$suite" in - jessie|trusty|vivid) + jessie|trusty) awk '$1 == "ENV" && $2 == "SECCOMP_VERSION" { print; exit }' ../../../Dockerfile >> "$version/Dockerfile" cat <<-'EOF' >> "$version/Dockerfile" RUN buildDeps=' \ diff --git a/contrib/builder/deb/ubuntu-vivid/Dockerfile b/contrib/builder/deb/ubuntu-vivid/Dockerfile deleted file mode 100644 index fd8d0297e8..0000000000 --- a/contrib/builder/deb/ubuntu-vivid/Dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -# -# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/generate.sh"! -# - -FROM ubuntu:vivid - -RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev libseccomp-dev libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* - -ENV SECCOMP_VERSION v2.2.3 -RUN buildDeps=' \ -automake \ -libtool \ -' \ -&& set -x \ -&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \ -&& rm -rf /var/lib/apt/lists/* \ -&& export SECCOMP_PATH=$(mktemp -d) \ -&& git clone -b "$SECCOMP_VERSION" --depth 1 https://github.com/seccomp/libseccomp.git "$SECCOMP_PATH" \ -&& ( \ -cd "$SECCOMP_PATH" \ -&& ./autogen.sh \ -&& ./configure --prefix=/usr \ -&& make \ -&& install -c src/.libs/libseccomp.a /usr/lib/libseccomp.a \ -&& chmod 644 /usr/lib/libseccomp.a \ -&& ranlib /usr/lib/libseccomp.a \ -&& ldconfig -n /usr/lib \ -) \ -&& rm -rf "$SECCOMP_PATH" \ -&& apt-get purge -y --auto-remove $buildDeps - -ENV GO_VERSION 1.5.2 -RUN curl -fSL "https://storage.googleapis.com/golang/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 seccomp selinux diff --git a/docs/installation/ubuntulinux.md b/docs/installation/ubuntulinux.md index a83de423a8..78731da621 100644 --- a/docs/installation/ubuntulinux.md +++ b/docs/installation/ubuntulinux.md @@ -14,7 +14,6 @@ weight = -6 Docker is supported on these Ubuntu operating systems: - Ubuntu Wily 15.10 -- Ubuntu Vivid 15.04 - Ubuntu Trusty 14.04 (LTS) - Ubuntu Precise 12.04 (LTS) @@ -23,7 +22,8 @@ installation mechanisms. Using these packages ensures you get the latest release of Docker. If you wish to install using Ubuntu-managed packages, consult your Ubuntu documentation. ->**Note**: Ubuntu Utopic 14.10 exists in Docker's `apt` repository but it is no longer officially supported. +>**Note**: Ubuntu Utopic 14.10 and 15.04 exist in Docker's `apt` repository but +> are no longer officially supported. ## Prerequisites @@ -75,10 +75,6 @@ packages from the new repository: deb https://apt.dockerproject.org/repo ubuntu-trusty main - - On Ubuntu Vivid 15.04 - - deb https://apt.dockerproject.org/repo ubuntu-vivid main - - Ubuntu Wily 15.10 deb https://apt.dockerproject.org/repo ubuntu-wily main diff --git a/hack/make/release-deb b/hack/make/release-deb index 341bab4535..7022c1e123 100755 --- a/hack/make/release-deb +++ b/hack/make/release-deb @@ -7,8 +7,8 @@ set -e # deb http://apt.dockerproject.org/repo $distro-$release $version # # For example: -# deb http://apt.dockerproject.org/repo ubuntu-trusy main -# deb http://apt.dockerproject.org/repo ubuntu-vivid testing +# deb http://apt.dockerproject.org/repo ubuntu-trusty main +# deb http://apt.dockerproject.org/repo ubuntu-trusty testing # deb http://apt.dockerproject.org/repo debian-wheezy experimental # deb http://apt.dockerproject.org/repo debian-jessie main #