summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-06-20 14:01:50 +0000
committerGerrit Code Review <review@openstack.org>2018-06-20 14:01:50 +0000
commitb0b0ba021eb8f773f9e93bfce2ea9f71e983b152 (patch)
treecaeea2598e2b101cae51a720349e96741ecbdd0a
parent426f8dacf31f608f828dbd2c75c0dfdc5a52cc60 (diff)
parent4ee79fc568f90a027caee32281711c63a6d891af (diff)
Merge "Image: update image makefile to use host-networking"
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 0697ab9..47c091a 100644
--- a/Makefile
+++ b/Makefile
@@ -65,9 +65,9 @@ helm-install:
65.PHONY: build 65.PHONY: build
66build: 66build:
67ifeq ($(USE_PROXY), true) 67ifeq ($(USE_PROXY), true)
68 docker build -t $(IMAGE) --label $(LABEL) -f $(IMAGE_DIR)/Dockerfile --build-arg SSTREAM_IMAGE=$(SSTREAM_IMAGE) --build-arg http_proxy=$(PROXY) --build-arg https_proxy=$(PROXY) $(IMAGE_DIR) 68 docker build -t $(IMAGE) --network=host --label $(LABEL) -f $(IMAGE_DIR)/Dockerfile --build-arg SSTREAM_IMAGE=$(SSTREAM_IMAGE) --build-arg http_proxy=$(PROXY) --build-arg https_proxy=$(PROXY) $(IMAGE_DIR)
69else 69else
70 docker build -t $(IMAGE) --label $(LABEL) --build-arg SSTREAM_IMAGE=$(SSTREAM_IMAGE) -f $(IMAGE_DIR)/Dockerfile $(IMAGE_DIR) 70 docker build -t $(IMAGE) --network=host --label $(LABEL) --build-arg SSTREAM_IMAGE=$(SSTREAM_IMAGE) -f $(IMAGE_DIR)/Dockerfile $(IMAGE_DIR)
71endif 71endif
72ifeq ($(PUSH_IMAGE), true) 72ifeq ($(PUSH_IMAGE), true)
73 docker push $(IMAGE) 73 docker push $(IMAGE)