From 94417a16f47cd9888b5e05e2342b33616feac27c Mon Sep 17 00:00:00 2001 From: Kenfe-Mickael Laventure Date: Thu, 29 Sep 2016 11:38:22 -0700 Subject: [PATCH] Remove Ubuntu 15.10 (Wily Werewolf) from build-deb targets As of July 28, 2016, it is officially EOL (https://lists.ubuntu.com/archives/ubuntu-announce/2016-July/000210.html) and will receive no further updates. Signed-off-by: Kenfe-Mickael Laventure Upstream-commit: e9a81057086cf9834cce4c49c6f8ef035938fc64 Component: engine --- .../engine/contrib/builder/deb/amd64/generate.sh | 2 +- .../builder/deb/amd64/ubuntu-wily/Dockerfile | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 components/engine/contrib/builder/deb/amd64/ubuntu-wily/Dockerfile diff --git a/components/engine/contrib/builder/deb/amd64/generate.sh b/components/engine/contrib/builder/deb/amd64/generate.sh index 038b753a4b..bd6b23eae9 100755 --- a/components/engine/contrib/builder/deb/amd64/generate.sh +++ b/components/engine/contrib/builder/deb/amd64/generate.sh @@ -81,7 +81,7 @@ for version in "${versions[@]}"; do # packaging for "sd-journal.h" and libraries varies case "$suite" in precise|wheezy) ;; - sid|stretch|wily|xenial) packages+=( libsystemd-dev );; + sid|stretch|xenial) packages+=( libsystemd-dev );; *) packages+=( libsystemd-journal-dev );; esac diff --git a/components/engine/contrib/builder/deb/amd64/ubuntu-wily/Dockerfile b/components/engine/contrib/builder/deb/amd64/ubuntu-wily/Dockerfile deleted file mode 100644 index aea571419c..0000000000 --- a/components/engine/contrib/builder/deb/amd64/ubuntu-wily/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -# -# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/amd64/generate.sh"! -# - -FROM ubuntu:wily - -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 libseccomp-dev libsqlite3-dev pkg-config libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* - -ENV GO_VERSION 1.7.1 -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 pkcs11 seccomp selinux -ENV RUNC_BUILDTAGS apparmor seccomp selinux