From 6c2e70dfb4ca5690cf3651682c8f9129a89f1566 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Fri, 26 Oct 2018 13:19:42 +0200 Subject: [PATCH] Remove Ubuntu 14.04 "trusty tahr" build scripts Docker no longer ships packages for Ubuntu 14.04, so remove the build scripts as well. Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 3a8fa7fc0acc5c3fb468ec5ec41e236e741c804e) Signed-off-by: Sebastiaan van Stijn Upstream-commit: 90fadd7b66e8696cc0d3479293bc62ea730ec51e Component: packaging --- components/packaging/README.md | 1 - components/packaging/deb/Makefile | 9 +---- .../packaging/deb/ubuntu-trusty/Dockerfile | 38 ------------------- 3 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 components/packaging/deb/ubuntu-trusty/Dockerfile diff --git a/components/packaging/README.md b/components/packaging/README.md index b408081aba..eb70181ac1 100644 --- a/components/packaging/README.md +++ b/components/packaging/README.md @@ -10,7 +10,6 @@ The scripts will build for this list of packages types: * DEB packages for Ubuntu 18.04 Bionic * DEB packages for Ubuntu 17.10 Artful * DEB packages for Ubuntu 16.04 Xenial -* DEB packages for Ubuntu 14.04 Trusty * DEB packages for Debian 10 Buster * DEB packages for Debian 9 Stretch * RPM packages for Fedora 28 diff --git a/components/packaging/deb/Makefile b/components/packaging/deb/Makefile index bcc8e5d6e2..77739ccfb4 100644 --- a/components/packaging/deb/Makefile +++ b/components/packaging/deb/Makefile @@ -55,7 +55,7 @@ engine-$(ARCH).tar: deb: ubuntu debian raspbian ## build all deb packages .PHONY: ubuntu -ubuntu: ubuntu-bionic ubuntu-xenial ubuntu-trusty ## build all ubuntu deb packages +ubuntu: ubuntu-bionic ubuntu-xenial ## build all ubuntu deb packages .PHONY: debian debian: debian-stretch ## build all debian deb packages @@ -77,13 +77,6 @@ ubuntu-xenial: $(SOURCES) $(RUN) $(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@ -.PHONY: ubuntu-trusty -ubuntu-trusty: ## build ubuntu trusty deb packages -ubuntu-trusty: $(SOURCES) - $(BUILD) - $(RUN) - $(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@ - .PHONY: debian-buster debian-buster: ## build debian buster deb packages debian-buster: $(SOURCES) diff --git a/components/packaging/deb/ubuntu-trusty/Dockerfile b/components/packaging/deb/ubuntu-trusty/Dockerfile deleted file mode 100644 index 2058674a0e..0000000000 --- a/components/packaging/deb/ubuntu-trusty/Dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -ARG GO_IMAGE -ARG ENGINE_IMAGE -ARG BUILD_IMAGE=ubuntu:trusty -FROM ${GO_IMAGE} as golang -FROM ${ENGINE_IMAGE} as engine - -FROM ${BUILD_IMAGE} - -RUN apt-get update && apt-get install -y curl devscripts equivs git - -ARG GO_VERSION -ENV GOPATH /go -ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin -ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux -ENV RUNC_BUILDTAGS apparmor seccomp selinux - -ARG COMMON_FILES -COPY ${COMMON_FILES} /root/build-deb/debian -RUN mk-build-deps -t "apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends -y" -i /root/build-deb/debian/control - -# Copy our sources and untar them -COPY sources/ /sources -RUN mkdir -p /go/src/github.com/docker/ && tar -xzf /sources/cli.tgz -C /go/src/github.com/docker/ - -RUN ln -snf /go/src/github.com/docker/cli /root/build-deb/cli - -ENV DISTRO ubuntu -ENV SUITE trusty - -COPY --from=golang /usr/local/go /usr/local/go -COPY --from=engine /bin/dockerd /source/ -COPY --from=engine /bin/docker-proxy /source/ -COPY --from=engine /bin/docker-init /source/ - -WORKDIR /root/build-deb -COPY build-deb /root/build-deb/build-deb - -ENTRYPOINT ["/root/build-deb/build-deb"]