kubernetes
/
git-sync
mirror of https://github.com/kubernetes/git-sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add proxy support to build

This commit is contained in:
chris060986 2018-12-20 14:41:06 +01:00
parent 8ef40b88e5
commit ea7c288dc3
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -98,6 +98,8 @@ bin/$(OS)_$(ARCH)/$(BIN): build-dirs
-v $$(pwd)/bin/$(OS)_$(ARCH):/go/bin/$(OS)_$(ARCH) \ -v $$(pwd)/bin/$(OS)_$(ARCH):/go/bin/$(OS)_$(ARCH) \
-v $$(pwd)/.go/std/$(OS)_$(ARCH):/usr/local/go/pkg/$(OS)_$(ARCH)_static \ -v $$(pwd)/.go/std/$(OS)_$(ARCH):/usr/local/go/pkg/$(OS)_$(ARCH)_static \
-v $$(pwd)/.go/cache:/.cache \ -v $$(pwd)/.go/cache:/.cache \
--env HTTP_PROXY=$(HTTP_PROXY) \
--env HTTPS_PROXY=$(HTTPS_PROXY) \
-w /go/src/$(PKG) \ -w /go/src/$(PKG) \
--rm \ --rm \
$(BUILD_IMAGE) \ $(BUILD_IMAGE) \
@ -110,7 +112,6 @@ bin/$(OS)_$(ARCH)/$(BIN): build-dirs
" "
DOTFILE_IMAGE = $(subst /,_,$(IMAGE))-$(TAG) DOTFILE_IMAGE = $(subst /,_,$(IMAGE))-$(TAG)
container: .container-$(DOTFILE_IMAGE) container-name container: .container-$(DOTFILE_IMAGE) container-name
.container-$(DOTFILE_IMAGE): bin/$(OS)_$(ARCH)/$(BIN) Dockerfile.in .container-$(DOTFILE_IMAGE): bin/$(OS)_$(ARCH)/$(BIN) Dockerfile.in
@sed \ @sed \
@ -119,7 +120,7 @@ container: .container-$(DOTFILE_IMAGE) container-name
-e 's|{ARG_OS}|$(OS)|g' \ -e 's|{ARG_OS}|$(OS)|g' \
-e 's|{ARG_FROM}|$(BASEIMAGE)|g' \ -e 's|{ARG_FROM}|$(BASEIMAGE)|g' \
Dockerfile.in > .dockerfile-$(OS)_$(ARCH) Dockerfile.in > .dockerfile-$(OS)_$(ARCH)
@docker build -t $(IMAGE):$(TAG) -f .dockerfile-$(OS)_$(ARCH) . @docker build --build-arg HTTP_PROXY=$(HTTP_PROXY) --build-arg=$(HTTPS_PROXY) -t $(IMAGE):$(TAG) -f .dockerfile-$(OS)_$(ARCH) .
@docker images -q $(IMAGE):$(TAG) > $@ @docker images -q $(IMAGE):$(TAG) > $@
container-name: container-name:
@ -155,6 +156,8 @@ test: build-dirs
-v $$(pwd)/bin/$(OS)_$(ARCH):/go/bin \ -v $$(pwd)/bin/$(OS)_$(ARCH):/go/bin \
-v $$(pwd)/.go/std/$(OS)_$(ARCH):/usr/local/go/pkg/$(OS)_$(ARCH)_static \ -v $$(pwd)/.go/std/$(OS)_$(ARCH):/usr/local/go/pkg/$(OS)_$(ARCH)_static \
-v $$(pwd)/.go/cache:/.cache \ -v $$(pwd)/.go/cache:/.cache \
--env HTTP_PROXY=$(HTTP_PROXY) \
--env HTTPS_PROXY=$(HTTPS_PROXY) \
-w /go/src/$(PKG) \ -w /go/src/$(PKG) \
$(BUILD_IMAGE) \ $(BUILD_IMAGE) \
/bin/sh -c " \ /bin/sh -c " \

3
README.md
View File

@ -17,6 +17,9 @@ symlink.
# build the container # build the container
make container REGISTRY=registry VERSION=tag make container REGISTRY=registry VERSION=tag
# build the container behind a proxy
make container REGISTRY=registry VERSION=tag HTTP_PROXY=http://<proxy_address>:<proxy_port> HTTPS_PROXY=https://<proxy_address>:<proxy_port>
# run the container # run the container
docker run -d \ docker run -d \
-v /tmp/git-data:/tmp/git \ -v /tmp/git-data:/tmp/git \