diff --git a/components/packaging/deb/Makefile b/components/packaging/deb/Makefile index 2ba451c169..f871d13ca8 100644 --- a/components/packaging/deb/Makefile +++ b/components/packaging/deb/Makefile @@ -36,7 +36,7 @@ deb: ubuntu debian raspbian ## build all deb packages ubuntu: ubuntu-bionic ubuntu-artful ubuntu-xenial ubuntu-trusty ## build all ubuntu deb packages .PHONY: debian -debian: debian-stretch debian-wheezy debian-jessie ## build all debian deb packages +debian: debian-stretch debian-jessie ## build all debian deb packages .PHONY: raspbian raspbian: raspbian-stretch debian-jessie ## build all raspbian deb packages @@ -83,12 +83,6 @@ debian-stretch: ## build debian stretch deb packages $(RUN) $(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@ -.PHONY: debian-wheezy -debian-wheezy: ## build debian wheezy deb packages - $(BUILD) - $(RUN) - $(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@ - .PHONY: raspbian-jessie raspbian-jessie: ## build raspbian jessie deb packages $(BUILD) diff --git a/components/packaging/deb/debian-wheezy/Dockerfile.x86_64 b/components/packaging/deb/debian-wheezy/Dockerfile.x86_64 deleted file mode 100644 index 65173434f9..0000000000 --- a/components/packaging/deb/debian-wheezy/Dockerfile.x86_64 +++ /dev/null @@ -1,34 +0,0 @@ -FROM debian:wheezy-backports - -# allow replacing httpredir or deb mirror -ARG APT_MIRROR=deb.debian.org -RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list -RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list.d/backports.list - -RUN apt-get update && apt-get install -y -t wheezy-backports btrfs-tools --no-install-recommends && rm -rf /var/lib/apt/lists/* -RUN apt-get update && apt-get install -y apparmor bash-completion build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libudev-dev pkg-config vim-common --no-install-recommends && rm -rf /var/lib/apt/lists/* - -ENV GO_VERSION 1.9.5 -RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local -ENV GOPATH /go -ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin -ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux -ENV RUNC_BUILDTAGS apparmor selinux - -COPY common/ /root/build-deb/debian -COPY build-deb /root/build-deb/build-deb - -RUN mkdir -p /go/src/github.com/docker && \ - mkdir -p /go/src/github.com/opencontainers && \ - ln -snf /engine /root/build-deb/engine && \ - ln -snf /cli /root/build-deb/cli && \ - ln -snf /root/build-deb/engine /go/src/github.com/docker/docker && \ - ln -snf /root/build-deb/cli /go/src/github.com/docker/cli - - -ENV DISTRO debian -ENV SUITE wheezy - -WORKDIR /root/build-deb - -ENTRYPOINT ["/root/build-deb/build-deb"]