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

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

Browse Source
This commit is contained in:
GordonTheTurtle
2017-12-08 17:04:13 +00:00
parent 16d5b20e33 376d2e9872
commit 6f58b7f1de
5 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/packaging/Makefile
View File

@ -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

2
components/packaging/deb/Makefile
View File

@ -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

2
components/packaging/rpm/Makefile
View File

@ -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

1
components/packaging/rpm/fedora-27/docker-ce.spec
View File

@ -15,6 +15,7 @@ Packager: Docker <support@docker.com>
%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)

2
components/packaging/static/Makefile
View File

@ -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