[YUNIKORN-136] Image build consistency (#35)
(cherry picked from commit fe31fb68ae85d134e661bf1d8b785e8ed1d5488f)
diff --git a/Makefile b/Makefile
index 35861ca..21efa8d 100644
--- a/Makefile
+++ b/Makefile
@@ -30,8 +30,8 @@
# Image build parameters
# This tag of the image must be changed when pushed to a public repository.
-ifeq ($(TAG),)
-TAG := yunikorn/yunikorn-web
+ifeq ($(REGISTRY),)
+REGISTRY := yunikorn
endif
# Set the default web port, this must be the same as in the nginx/nginx.conf file.
@@ -50,7 +50,7 @@
# Run the web interface from the production image
.PHONY: run
run: image
- docker run -d -p ${PORT}:9889 ${TAG}:${VERSION}
+ docker run -d -p ${PORT}:9889 ${REGISTRY}/yunikorn-web:${VERSION}
# Build the web interface in a production ready version
.PHONY: build-prod
@@ -59,8 +59,9 @@
# Build an image based on the production ready version
image: build-prod
+ @echo "building web UI docker image"
@SHA=$$(git rev-parse --short=12 HEAD) ; \
- docker build -t ${TAG}:${VERSION} . \
+ docker build -t ${REGISTRY}/yunikorn-web:${VERSION} . \
--label "GitRevision=$${SHA}" \
--label "Version=${VERSION}" \
--label "BuildTimeStamp=${DATE}"
diff --git a/README.md b/README.md
index 5bd5518..1f57a93 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,21 @@
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ -->
+
# Yunikorn web UI
YuniKorn web provides a web interface on top of the scheduler. It provides insight in the current and historic scheduler status.
It depends on `yunikorn-core` which encapsulates all the actual scheduling logic.
@@ -31,11 +49,11 @@
Run `make image` to build the docker image `yunikorn-web`.
Run `make run` to build the image and deploy the container from the docker image `yunikorn-web`.
-You can set `TAG` and `VERSION` in the commandline to build docker image with a specified version and tag. For example,
+You can set `REGISTRY` and `VERSION` in the commandline to build docker image with a specified version and registry. For example,
```
-make image TAG=yunikorn/yunikorn-web VERSION=latest
+make image REGISTRY=yunikorn VERSION=latest
```
-this command will build binary with version `latest` and the docker image tag is `yunikorn/yunikorn-web:latest`.
+this command will build binary with version `latest` and the docker full image tag is `yunikorn/yunikorn-web:latest`.
Run `make deploy-prod` to build and deploy the scheduler webapp using docker-compose.
The project uses [multi-stage build](https://docs.docker.com/develop/develop-images/multistage-build/) feature of the docker and requires Docker 17.05 or higher.
diff --git a/landmark/docker_images.yaml b/landmark/docker_images.yaml
new file mode 100644
index 0000000..af3bdd8
--- /dev/null
+++ b/landmark/docker_images.yaml
@@ -0,0 +1,21 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you 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.
+#
+
+docker_images:
+ yunikorn-web: __registry__/yunikorn-web
