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

Merge component 'packaging' from git@github.com:docker/docker-ce-packaging 18.09

Browse Source
This commit is contained in:
GordonTheTurtle
2018-09-10 21:06:01 +00:00
parent 5e8bd8d686 6af5c2b6a9
commit 4a4191fafe
14 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/packaging/deb/Makefile
View File

@ -13,8 +13,13 @@ DEB_VERSION?=$(shell SUFFIX=$(SUFFIX) ./gen-deb-ver $(CLI_DIR) "$(VERSION)")
CHOWN:=docker run --rm -v $(CURDIR):/v -w /v alpine chown
EPOCH?=4
ifdef BUILD_IMAGE
BUILD_IMAGE_FLAG=--build-arg $(BUILD_IMAGE)
endif
COMMON_FILES=common
BUILD?=docker build \
$(BUILD_IMAGE_FLAG) \
--build-arg GO_IMAGE=$(GO_IMAGE) \
--build-arg COMMON_FILES=$(COMMON_FILES) \
--build-arg CONTAINERD_SHIM_PROCESS_IMAGE=$(CONTAINERD_SHIM_PROCESS_IMAGE) \

3
components/packaging/deb/debian-buster/Dockerfile
View File

@ -1,9 +1,10 @@
ARG GO_IMAGE
ARG CONTAINERD_SHIM_PROCESS_IMAGE
ARG BUILD_IMAGE=debian:buster
FROM ${GO_IMAGE} as golang
FROM ${CONTAINERD_SHIM_PROCESS_IMAGE} as shim-process
FROM debian:buster
FROM ${BUILD_IMAGE}
RUN apt-get update && apt-get install -y curl devscripts equivs git

3
components/packaging/deb/debian-jessie/Dockerfile
View File

@ -1,9 +1,10 @@
ARG GO_IMAGE
ARG CONTAINERD_SHIM_PROCESS_IMAGE
ARG BUILD_IMAGE=debian:jessie
FROM ${GO_IMAGE} as golang
FROM ${CONTAINERD_SHIM_PROCESS_IMAGE} as shim-process
FROM debian:jessie
FROM ${BUILD_IMAGE}
RUN apt-get update && apt-get install -y curl devscripts equivs git

3
components/packaging/deb/debian-stretch/Dockerfile
View File

@ -1,9 +1,10 @@
ARG GO_IMAGE
ARG CONTAINERD_SHIM_PROCESS_IMAGE
ARG BUILD_IMAGE=debian:stretch
FROM ${GO_IMAGE} as golang
FROM ${CONTAINERD_SHIM_PROCESS_IMAGE} as shim-process
FROM debian:stretch
FROM ${BUILD_IMAGE}
RUN apt-get update && apt-get install -y curl devscripts equivs git

3
components/packaging/deb/raspbian-jessie/Dockerfile
View File

@ -1,9 +1,10 @@
ARG GO_IMAGE
ARG CONTAINERD_SHIM_PROCESS_IMAGE
ARG BUILD_IMAGE=resin/rpi-raspbian:jessie
FROM ${GO_IMAGE} as golang
FROM ${CONTAINERD_SHIM_PROCESS_IMAGE} as shim-process
FROM resin/rpi-raspbian:jessie
FROM ${BUILD_IMAGE}
RUN apt-get update && apt-get install -y curl devscripts equivs git

3
components/packaging/deb/raspbian-stretch/Dockerfile
View File

@ -1,9 +1,10 @@
ARG GO_IMAGE
ARG CONTAINERD_SHIM_PROCESS_IMAGE
ARG BUILD_IMAGE=resin/rpi-raspbian:stretch
FROM ${GO_IMAGE} as golang
FROM ${CONTAINERD_SHIM_PROCESS_IMAGE} as shim-process
FROM resin/rpi-raspbian:stretch
FROM ${BUILD_IMAGE}
RUN apt-get update && apt-get install -y curl devscripts equivs git

3
components/packaging/deb/ubuntu-bionic/Dockerfile
View File

@ -1,9 +1,10 @@
ARG GO_IMAGE
ARG CONTAINERD_SHIM_PROCESS_IMAGE
ARG BUILD_IMAGE=ubuntu:bionic
FROM ${GO_IMAGE} as golang
FROM ${CONTAINERD_SHIM_PROCESS_IMAGE} as shim-process
FROM ubuntu:bionic
FROM ${BUILD_IMAGE}
RUN apt-get update && apt-get install -y curl devscripts equivs git

3
components/packaging/deb/ubuntu-trusty/Dockerfile
View File

@ -1,9 +1,10 @@
ARG GO_IMAGE
ARG CONTAINERD_SHIM_PROCESS_IMAGE
ARG BUILD_IMAGE=ubuntu:trusty
FROM ${GO_IMAGE} as golang
FROM ${CONTAINERD_SHIM_PROCESS_IMAGE} as shim-process
FROM ubuntu:trusty
FROM ${BUILD_IMAGE}
RUN apt-get update && apt-get install -y curl devscripts equivs git

3
components/packaging/deb/ubuntu-xenial/Dockerfile
View File

@ -1,9 +1,10 @@
ARG GO_IMAGE
ARG CONTAINERD_SHIM_PROCESS_IMAGE
ARG BUILD_IMAGE=ubuntu:xenial
FROM ${GO_IMAGE} as golang
FROM ${CONTAINERD_SHIM_PROCESS_IMAGE} as shim-process
FROM ubuntu:xenial
FROM ${BUILD_IMAGE}
RUN apt-get update && apt-get install -y curl devscripts equivs git

4
components/packaging/image/Makefile
View File

@ -4,7 +4,7 @@ CLI_DIR:=$(CURDIR)/../../cli
VERSION?=0.0.0-dev
GO_BASE_IMAGE=golang
GO_VERSION:=1.10.4
GO_IMAGE=$(GO_BASE_IMAGE):$(GO_VERSION)
ENGINE_GO_IMAGE=$(GO_BASE_IMAGE):$(GO_VERSION)
STATIC_VERSION=$(shell ../static/gen-static-ver $(ENGINE_DIR) $(VERSION))
DOCKER_HUB_ORG?=dockereng
ARCH=$(shell uname -m)
@ -32,7 +32,7 @@ $(ENGINE_DIR)/Dockerfile.engine:
# utilize manifests
image-linux: $(ENGINE_DIR)/Dockerfile.engine
docker build -t $(DOCKER_HUB_ORG)/$(ENGINE_IMAGE):$(STATIC_VERSION).$(ARCH) \
--build-arg GO_IMAGE="$(GO_IMAGE)" \
--build-arg GO_IMAGE="$(ENGINE_GO_IMAGE)" \
--build-arg VERSION="$(STATIC_VERSION)" \
--build-arg GITCOMMIT="$$(cd $(ENGINE_DIR) && git rev-parse --short=7 HEAD)" \
--build-arg BUILDTIME="$(BUILDTIME)" \

4
components/packaging/rpm/Makefile
View File

@ -15,7 +15,11 @@ DOCKERFILE=Dockerfile
ifdef NEEDS_ARCH_SPECIFIC
DOCKERFILE=Dockerfile.$(ARCH)
endif
ifdef BUILD_IMAGE
BUILD_IMAGE_FLAG=--build-arg $(BUILD_IMAGE)
endif
BUILD?=docker build \
$(BUILD_IMAGE_FLAG) \
--build-arg GO_IMAGE=$(GO_IMAGE) \
--build-arg CONTAINERD_SHIM_PROCESS_IMAGE=$(CONTAINERD_SHIM_PROCESS_IMAGE) \
-t rpmbuild-$@/$(ARCH) \

3
components/packaging/rpm/centos-7/Dockerfile
View File

@ -1,9 +1,10 @@
ARG GO_IMAGE
ARG CONTAINERD_SHIM_PROCESS_IMAGE
ARG BUILD_IMAGE=centos:7
FROM ${GO_IMAGE} as golang
FROM ${CONTAINERD_SHIM_PROCESS_IMAGE} as shim-process
FROM centos:7
FROM ${BUILD_IMAGE}
ENV DISTRO centos
ENV SUITE 7
ENV GOPATH=/go

3
components/packaging/rpm/fedora-27/Dockerfile
View File

@ -1,9 +1,10 @@
ARG GO_IMAGE
ARG CONTAINERD_SHIM_PROCESS_IMAGE
ARG BUILD_IMAGE=fedora:27
FROM ${GO_IMAGE} as golang
FROM ${CONTAINERD_SHIM_PROCESS_IMAGE} as shim-process
FROM fedora:27
FROM ${BUILD_IMAGE}
ENV DISTRO fedora
ENV SUITE 27
ENV GOPATH /go

3
components/packaging/rpm/fedora-28/Dockerfile
View File

@ -1,9 +1,10 @@
ARG GO_IMAGE
ARG CONTAINERD_SHIM_PROCESS_IMAGE
ARG BUILD_IMAGE=fedora:28
FROM ${GO_IMAGE} as golang
FROM ${CONTAINERD_SHIM_PROCESS_IMAGE} as shim-process
FROM fedora:28
FROM ${BUILD_IMAGE}
ENV DISTRO fedora
ENV SUITE 28
ENV GOPATH /go