summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPete Birley <pete@port.direct>2018-06-14 16:35:25 -0500
committerPete Birley <pete@port.direct>2018-06-16 11:02:45 -0500
commit4ee79fc568f90a027caee32281711c63a6d891af (patch)
tree138b6f93f1c3361b267e425f94b338d4ad9420ec
parent8adc845af51927ff0ead24d4027a803a5bc644d0 (diff)
Image: update image makefile to use host-networking
This PS updates the makefile to use host-networking, allowing simple build on systems not using dockers iptables. Change-Id: I71b07499ca38243ff6c7c86f6427348036384547 Signed-off-by: Pete Birley <pete@port.direct>
Notes
Notes (review): Code-Review+1: Tin Lam <tin@irrational.io> Code-Review+2: Aaron Sheffield <ajs@sheffieldfamily.net> Code-Review+2: Scott Hussey <sthussey@att.com> Workflow+1: Scott Hussey <sthussey@att.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 20 Jun 2018 14:01:50 +0000 Reviewed-on: https://review.openstack.org/575551 Project: openstack/airship-maas Branch: refs/heads/master
-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)