From fd25684fc8e7efb74448a2bfa62c578d020133e6 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Thu, 7 Dec 2017 14:25:41 -0800 Subject: [PATCH 1/2] Defaults Makefile VERSION variable to 0.0.0-dev (#67) When building we should default to a dummy version unless otherwise specified so we don't get ourselves confused over what is official and what is not. Signed-off-by: Eli Uriegas Upstream-commit: ffcd040b5c3bd4f81e1d1f11c32f9bb81e235ed1 Component: packaging --- components/packaging/Makefile | 2 +- components/packaging/deb/Makefile | 2 +- components/packaging/rpm/Makefile | 2 +- components/packaging/static/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/packaging/Makefile b/components/packaging/Makefile index c5e1f95e53..b771da48d7 100644 --- a/components/packaging/Makefile +++ b/components/packaging/Makefile @@ -1,7 +1,7 @@ SHELL:=/bin/bash ENGINE_DIR:=$(CURDIR)/../engine CLI_DIR:=$(CURDIR)/../cli -VERSION=unknown +VERSION?=0.0.0-dev DOCKER_GITCOMMIT:=abcdefg .PHONY: help clean rpm deb static diff --git a/components/packaging/deb/Makefile b/components/packaging/deb/Makefile index ed5423a46e..5a2c60712e 100644 --- a/components/packaging/deb/Makefile +++ b/components/packaging/deb/Makefile @@ -3,7 +3,7 @@ ARCH:=$(shell uname -m) ENGINE_DIR:=$(CURDIR)/../../engine CLI_DIR:=$(CURDIR)/../../cli GITCOMMIT?=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD) -VERSION?=$(shell cat $(ENGINE_DIR)/VERSION) +VERSION?=0.0.0-dev DOCKER_EXPERIMENTAL:=0 CHOWN:=docker run --rm -v $(CURDIR):/v -w /v alpine chown diff --git a/components/packaging/rpm/Makefile b/components/packaging/rpm/Makefile index 7350ed3420..91588c2e6b 100644 --- a/components/packaging/rpm/Makefile +++ b/components/packaging/rpm/Makefile @@ -2,7 +2,7 @@ ARCH=$(shell uname -m) ENGINE_DIR:=$(CURDIR)/../../engine CLI_DIR:=$(CURDIR)/../../cli GITCOMMIT=$(shell cd $(ENGINE_DIR) && git rev-parse --short HEAD) -VERSION=$(shell cat $(ENGINE_DIR)/VERSION) +VERSION?=0.0.0-dev DOCKER_EXPERIMENTAL=0 GEN_RPM_VER=$(shell ./gen-rpm-ver $(ENGINE_DIR) $(VERSION)) CHOWN=docker run --rm -i -v $(CURDIR):/v -w /v alpine chown diff --git a/components/packaging/static/Makefile b/components/packaging/static/Makefile index 6ac4dc1a34..5d07b5862b 100644 --- a/components/packaging/static/Makefile +++ b/components/packaging/static/Makefile @@ -1,7 +1,7 @@ SHELL:=/bin/bash ENGINE_DIR:=$(CURDIR)/../../engine CLI_DIR:=$(CURDIR)/../../cli -VERSION=$(shell cat $(ENGINE_DIR)/VERSION) +VERSION?=0.0.0-dev CHOWN=docker run --rm -v $(CURDIR):/v -w /v alpine chown HASH_CMD=docker run -v $(CURDIR):/sum -w /sum debian:jessie bash hash_files DIR_TO_HASH:=build/linux From 6edf75f3d55d897d2573a78e9feafecf1553c1e5 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Thu, 7 Dec 2017 23:56:30 +0000 Subject: [PATCH 2/2] Do not terminate on missing build-ids Relates to an upgrade in `rpm` to `14.4.0`, where missing build-ids now cause builds to self-terminate. May be needed in other distros if/when the `rpm` package is updated in those repos. Signed-off-by: Eli Uriegas Upstream-commit: dcd681da54f2c2b2286cc09d053dd6cb865d3f98 Component: packaging --- components/packaging/rpm/fedora-27/docker-ce.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/components/packaging/rpm/fedora-27/docker-ce.spec b/components/packaging/rpm/fedora-27/docker-ce.spec index 179e684a70..2a6c5a8d06 100644 --- a/components/packaging/rpm/fedora-27/docker-ce.spec +++ b/components/packaging/rpm/fedora-27/docker-ce.spec @@ -15,6 +15,7 @@ Packager: Docker %global _dwz_low_mem_die_limit 0 %global is_systemd 1 %global with_selinux 1 +%global _missing_build_ids_terminate_build 0 BuildRequires: pkgconfig(systemd)