toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #254 from thaJeztah/18.09_backport_remove_old_distros

Browse Source 
Merged with https://github.com/seemethere/unir
Upstream-commit: 1750dc22c9428a360fa31045198433cb60c4f3ad
Component: packaging
This commit is contained in:
docker-unir[bot]
2018-11-26 16:36:52 +00:00
committed by GitHub
parent 1703e794fe 8d9b4f4fd9
commit 959e3a80b6
5 changed files with 3 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/packaging/README.md
-4
View File
@@ -8,13 +8,9 @@ This repository is solely maintained by Docker, Inc.
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
* DEB packages for Debian 8 Jessie
* DEB packages for Debian 7 Wheezy
* RPM packages for Fedora 28
* RPM packages for Fedora 27
* RPM packages for CentOS 7
components/packaging/deb/Makefile
+3 -24
View File
@@ -55,13 +55,13 @@ 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 debian-jessie ## build all debian deb packages
debian: debian-stretch ## build all debian deb packages
.PHONY: raspbian
raspbian: raspbian-stretch debian-jessie ## build all raspbian deb packages
raspbian: raspbian-stretch ## build all raspbian deb packages
.PHONY: ubuntu-cosmic
ubuntu-cosmic: ## build ubuntu cosmic deb packages
@@ -84,13 +84,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)
@@ -98,13 +91,6 @@ debian-buster: $(SOURCES)
$(RUN)
$(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@
.PHONY: debian-jessie
debian-jessie: ## build debian jessie deb packages
debian-jessie: $(SOURCES)
$(BUILD)
$(RUN)
$(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@
.PHONY: debian-stretch
debian-stretch: ## build debian stretch deb packages
debian-stretch: $(SOURCES)
@@ -112,13 +98,6 @@ debian-stretch: $(SOURCES)
$(RUN)
$(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@
.PHONY: raspbian-jessie
raspbian-jessie: ## build raspbian jessie deb packages
raspbian-jessie: $(SOURCES)
$(BUILD)
$(RUN)
$(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@
.PHONY: raspbian-stretch
raspbian-stretch: ## build raspbian stretch deb packages
raspbian-stretch: $(SOURCES)
components/packaging/deb/debian-jessie/Dockerfile
-38
View File
@@ -1,38 +0,0 @@
ARG GO_IMAGE
ARG ENGINE_IMAGE
ARG BUILD_IMAGE=debian:jessie
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 debian
ENV SUITE jessie
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"]
components/packaging/deb/raspbian-jessie/Dockerfile
-38
View File
@@ -1,38 +0,0 @@
ARG GO_IMAGE
ARG ENGINE_IMAGE
ARG BUILD_IMAGE=resin/rpi-raspbian:jessie
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 raspbian
ENV SUITE jessie
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"]
components/packaging/deb/ubuntu-trusty/Dockerfile
-38
View File
@@ -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"]