CORD-1551 - updated maas makefiles and multi-stage dockerfile
Change-Id: I0bab86e0207edb12f553ddcfe040882f04f34f25
diff --git a/ip-allocator/Dockerfile b/ip-allocator/Dockerfile.allocator
similarity index 81%
rename from ip-allocator/Dockerfile
rename to ip-allocator/Dockerfile.allocator
index 27167f1..9108ffa 100644
--- a/ip-allocator/Dockerfile
+++ b/ip-allocator/Dockerfile.allocator
@@ -11,12 +11,17 @@
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
-FROM golang:1.7-alpine
+FROM golang:1.7-alpine as builder
MAINTAINER Open Networking Laboratory <info@onlab.us>
WORKDIR /go
ADD . /go/src/gerrit.opencord.org/maas/cord-ip-allocator
-RUN go build -o /service/entry-point gerrit.opencord.org/maas/cord-ip-allocator
+RUN go build -o /build/entry-point gerrit.opencord.org/maas/cord-ip-allocator
+
+FROM alpine:3.5
+MAINTAINER Open Networking Laboratory <info@onlab.us>
+
+copy --from=builder /build/entry-point /service/entry-point
LABEL org.label-schema.name="allocator" \
org.label-schema.description="Provides IP address allocation for fabric interfaces" \
diff --git a/ip-allocator/Dockerfile.release b/ip-allocator/Dockerfile.release
deleted file mode 100644
index 3dc00f1..0000000
--- a/ip-allocator/Dockerfile.release
+++ /dev/null
@@ -1,27 +0,0 @@
-## Copyright 2017 Open Networking Laboratory
-##
-## Licensed under the Apache License, Version 2.0 (the "License");
-## you may not use this file except in compliance with the License.
-## You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-FROM alpine:3.5
-MAINTAINER Open Networking Laboratory <info@onlab.us>
-
-RUN mkdir /service
-ADD entry-point /service/entry-point
-
-LABEL org.label-schema.name="allocator" \
- org.label-schema.description="Provides IP address allocation for fabric interfaces" \
- org.label-schema.vcs-url="https://gerrit.opencord.org/maas" \
- org.label-schema.vendor="Open Networking Laboratory" \
- org.label-schema.schema-version="1.0"
-
-WORKDIR /service
-ENTRYPOINT ["/service/entry-point"]
diff --git a/ip-allocator/Makefile b/ip-allocator/Makefile
index ad1834c..4ec083f 100644
--- a/ip-allocator/Makefile
+++ b/ip-allocator/Makefile
@@ -1,38 +1,5 @@
-IMAGE_NAME=cord-ip-allocator
-BINARY=entry-point
-BUILD_TAG=build
-PACKAGE_TAG=candidate
+IMAGES+=allocator
-.PHONY: help
-help:
- @echo "build - create the binary"
- @echo "package - package the binary into a docker container"
- @echo "clean - remove tempory files and build artifacts"
- @echo "help - this message"
+allocator.image: Dockerfile.allocator *.go vendor/vendor.json
-BUILD_DATE=$(shell date -u +%Y-%m-%dT%TZ)
-VCS_REF=$(shell git log --pretty=format:%H -n 1)
-VCS_REF_DATE=$(shell git log --pretty=format:%cd --date=format:%FT%T%z -n 1)
-BRANCHES=$(shell repo --color=never --no-pager branches 2>/dev/null | wc -l)
-STATUS=$(shell repo --color=never --no-pager status . | tail -n +2 | wc -l)
-MODIFIED=$(shell test $(BRANCHES) -eq 0 && test $(STATUS) -eq 0 || echo "[modified]")
-BRANCH=$(shell repo --color=never --no-pager info -l -o | grep 'Manifest branch:' | awk '{print $$NF}')
-VERSION=$(BRANCH)$(MODIFIED)
-
-.PHONY: build
-build:
- docker build -t $(IMAGE_NAME):$(BUILD_TAG) .
-
-.PHONY: package
-package:
- $(eval BUILD_ID := $(shell docker create $(IMAGE_NAME):$(BUILD_TAG)))
- $(eval BINDIR := $(shell mktemp -d))
- docker cp $(BUILD_ID):/service/$(BINARY) $(BINDIR)/$(BINARY)
- cp Dockerfile.release $(BINDIR)
- docker build -f $(BINDIR)/Dockerfile.release -t $(IMAGE_NAME):$(PACKAGE_TAG) --label org.label-schema.build-date=$(BUILD_DATE) --label org.label-schema.vcs-ref=$(VCS_REF) --label org.label-schema.vcs-ref-date=$(VCS_REF_DATE) --label org.label-schema.version=$(VERSION) $(BINDIR)
- docker rm -f $(BUILD_ID)
- rm -r $(BINDIR)
-
-.PHONY: clean
-clean:
- @echo ""
+include ../rules.mk