docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2245 from jeanlaurent/2204-make-fail-with-https 

Fix for #2244 - make fails with https remote url
This commit is contained in:
David Gageot 2015-11-18 09:21:58 +01:00
parent a0b75d1645 40d153145f
commit d8da062f73
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.inc
View File

@ -1,9 +1,5 @@
# Project name, used to name the binaries # Project name, used to name the binaries
PKG_NAME := docker-machine PKG_NAME := docker-machine
# Github infos
GITHUB_INFO := $(shell git config --get remote.origin.url | sed -e 's/.*:\(.*\).git/\1/')
GH_USER ?= $(shell echo $(GITHUB_INFO) | cut -d \/ -f 1)
GH_REPO ?= $(shell echo $(GITHUB_INFO) | cut -d \/ -f 2)
# If true, disable optimizations and does NOT strip the binary # If true, disable optimizations and does NOT strip the binary
DEBUG ?= DEBUG ?=

4
mk/release.mk
View File

@ -9,6 +9,10 @@ release-pack:
find ./bin -type d -mindepth 1 -exec zip -r -j {}.zip {} \; find ./bin -type d -mindepth 1 -exec zip -r -j {}.zip {} \;
release: clean dco fmt test test-long build-x release-pack release-checksum release: clean dco fmt test test-long build-x release-pack release-checksum
# Github infos
GH_USER ?= $(shell git config --get remote.origin.url | sed -e 's/.*[:/]\(.*\)\/\([^.]*\)\(.*\)/\1/')
GH_REPO ?= $(shell git config --get remote.origin.url | sed -e 's/.*[:/]\(.*\)\/\([^.]*\)\(.*\)/\2/')
$(if $(GITHUB_TOKEN), , \ $(if $(GITHUB_TOKEN), , \
$(error GITHUB_TOKEN must be set for github-release)) $(error GITHUB_TOKEN must be set for github-release))