Skip to content

Commit

Permalink
Merge pull request moby#18809 from thaJeztah/EOL-ubuntu-15.04-vivid
Browse files Browse the repository at this point in the history
Remove Ubuntu 15.04 (Vivid) from DEB build for 1.10 as it will be EOL
  • Loading branch information
vdemeester committed Dec 21, 2015
2 parents 8537501 + 325b1f3 commit eff810a
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 48 deletions.
4 changes: 2 additions & 2 deletions contrib/builder/deb/generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=' \
Expand Down
38 changes: 0 additions & 38 deletions contrib/builder/deb/ubuntu-vivid/Dockerfile

This file was deleted.

8 changes: 2 additions & 6 deletions docs/installation/ubuntulinux.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

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

Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions hack/make/release-deb
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand Down

0 comments on commit eff810a

Please sign in to comment.