From e18e9addc62568b02c96c3eef43856c8cf330757 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Thu, 19 Oct 2017 11:15:20 -0700 Subject: [PATCH] Add Ubuntu 17.10, Artful Signed-off-by: Eli Uriegas Upstream-commit: 1468941a50dba7e0a82a01cb938338041f028ef9 Component: packaging --- components/packaging/deb/Makefile | 13 +++++++++ .../deb/ubuntu-artful/Dockerfile.armv7l | 28 +++++++++++++++++++ .../deb/ubuntu-artful/Dockerfile.ppc64le | 28 +++++++++++++++++++ .../deb/ubuntu-artful/Dockerfile.s390x | 28 +++++++++++++++++++ .../deb/ubuntu-artful/Dockerfile.x86_64 | 28 +++++++++++++++++++ 5 files changed, 125 insertions(+) create mode 100644 components/packaging/deb/ubuntu-artful/Dockerfile.armv7l create mode 100644 components/packaging/deb/ubuntu-artful/Dockerfile.ppc64le create mode 100644 components/packaging/deb/ubuntu-artful/Dockerfile.s390x create mode 100644 components/packaging/deb/ubuntu-artful/Dockerfile.x86_64 diff --git a/components/packaging/deb/Makefile b/components/packaging/deb/Makefile index ef893ce04d..2cc01e7e45 100644 --- a/components/packaging/deb/Makefile +++ b/components/packaging/deb/Makefile @@ -61,6 +61,19 @@ ubuntu-zesty: ## build ubuntu zesty deb packages debbuild-$@/$(ARCH) $(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@ +.PHONY: ubuntu-artful +ubuntu-artful: ## build ubuntu artful deb packages + docker build -t debbuild-$@/$(ARCH) -f $(CURDIR)/$@/Dockerfile.$(ARCH) . + docker run --rm -i \ + -e VERSION=$(VERSION) \ + -e DOCKER_GITCOMMIT=$(GITCOMMIT) \ + -v $(CURDIR)/debbuild/$@:/build \ + -v $(ENGINE_DIR):/engine \ + -v $(CLI_DIR):/cli \ + -v $(CURDIR)/systemd:/root/build-deb/systemd \ + debbuild-$@/$(ARCH) + $(CHOWN) -R $(shell id -u):$(shell id -g) debbuild/$@ + debian-buster: ## build debian buster deb packages docker build -t debbuild-$@/$(ARCH) -f $(CURDIR)/$@/Dockerfile.$(ARCH) . docker run --rm -i \ diff --git a/components/packaging/deb/ubuntu-artful/Dockerfile.armv7l b/components/packaging/deb/ubuntu-artful/Dockerfile.armv7l new file mode 100644 index 0000000000..a7373faba2 --- /dev/null +++ b/components/packaging/deb/ubuntu-artful/Dockerfile.armv7l @@ -0,0 +1,28 @@ +FROM arm32v7/ubuntu:artful + +RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* + +ENV GO_VERSION 1.8.3 +RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local +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 + +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 ubuntu +ENV SUITE artful + +WORKDIR /root/build-deb + +ENTRYPOINT ["/root/build-deb/build-deb"] diff --git a/components/packaging/deb/ubuntu-artful/Dockerfile.ppc64le b/components/packaging/deb/ubuntu-artful/Dockerfile.ppc64le new file mode 100644 index 0000000000..647b0860a2 --- /dev/null +++ b/components/packaging/deb/ubuntu-artful/Dockerfile.ppc64le @@ -0,0 +1,28 @@ +FROM ppc64le/ubuntu:artful + +RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev pkg-config vim-common libseccomp-dev libsystemd-dev libltdl-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* + +ENV GO_VERSION 1.8.3 +RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" | tar xzC /usr/local +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 + +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 ubuntu +ENV SUITE artful + +WORKDIR /root/build-deb + +ENTRYPOINT ["/root/build-deb/build-deb"] diff --git a/components/packaging/deb/ubuntu-artful/Dockerfile.s390x b/components/packaging/deb/ubuntu-artful/Dockerfile.s390x new file mode 100644 index 0000000000..8191851262 --- /dev/null +++ b/components/packaging/deb/ubuntu-artful/Dockerfile.s390x @@ -0,0 +1,28 @@ +FROM s390x/ubuntu:artful + +RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* + +ENV GO_VERSION 1.8.3 +RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" | tar xzC /usr/local +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 + +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 ubuntu +ENV SUITE artful + +WORKDIR /root/build-deb + +ENTRYPOINT ["/root/build-deb/build-deb"] diff --git a/components/packaging/deb/ubuntu-artful/Dockerfile.x86_64 b/components/packaging/deb/ubuntu-artful/Dockerfile.x86_64 new file mode 100644 index 0000000000..42ecfaad84 --- /dev/null +++ b/components/packaging/deb/ubuntu-artful/Dockerfile.x86_64 @@ -0,0 +1,28 @@ +FROM ubuntu:artful + +RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* + +ENV GO_VERSION 1.8.3 +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 seccomp selinux +ENV RUNC_BUILDTAGS apparmor seccomp 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 ubuntu +ENV SUITE artful + +WORKDIR /root/build-deb + +ENTRYPOINT ["/root/build-deb/build-deb"]