From 896c084fe200abc7265b2972b43fd4402cca01b7 Mon Sep 17 00:00:00 2001
From: Krishna Harsha Voora <krishvoor@in.ibm.com>
Date: Thu, 10 May 2018 11:05:41 -0400
Subject: [PATCH] [CE-361] Update make targets for ppc64le/s390x

This PR Addresses 2 points :-

1) make target "watchdog" for ppc64le/s390x is not present.

2) make target "engine" was moved to dockerhub location
as part of commit 2891c4f55da5bf0e0e7f65654313a22d10cf5b32
and hence make start would fail.

Change-Id: I6fbf365feffa53a0f92e7e481606b40f1ac6225b
Signed-off-by: Krishna Harsha Voora <krishvoor@in.ibm.com>
---
 Makefile                      |  6 ++++--
 docker/engine/Dockerfile.in   | 12 ++++++++++++
 docker/watchdog/Dockerfile.in |  8 ++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 docker/engine/Dockerfile.in
 create mode 100644 docker/watchdog/Dockerfile.in

diff --git a/Makefile b/Makefile
index 15bf668e3..8100fa8a3 100755
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ else
 endif
 
 # Docker images needed to run cello services
-DOCKER_IMAGES = baseimage mongo nginx operator-dashboard ansible-agent user-dashboard
+DOCKER_IMAGES = baseimage mongo nginx engine operator-dashboard ansible-agent watchdog user-dashboard
 DUMMY = .$(IMG_TAG)
 
 ifeq ($(DOCKER_BASE), )
@@ -102,8 +102,10 @@ all: check
 build/docker/baseimage/$(DUMMY): build/docker/baseimage/$(DUMMY)
 build/docker/nginx/$(DUMMY): build/docker/nginx/$(DUMMY)
 build/docker/mongo/$(DUMMY): build/docker/mongo/$(DUMMY)
+build/docker/engine/$(DUMMY): build/docker/engine/$(DUMMY)
 build/docker/operator-dashboard/$(DUMMY): build/docker/operator-dashboard/$(DUMMY)
 build/docker/ansible-agent/$(DUMMY): build/docker/ansible-agent/$(DUMMY)
+build/docker/watchdog/$(DUMMY): build/docker/watchdog/$(DUMMY)
 build/docker/user-dashboard/$(DUMMY): build/docker/user-dashboard/$(DUMMY)
 
 build/docker/%/$(DUMMY): ##@Build an image locally
@@ -132,7 +134,7 @@ docker: $(patsubst %,build/docker/%/$(DUMMY),$(DOCKER_IMAGES)) ##@Generate docke
 
 docker-operator-dashboard: build/docker/operator-dashboard/$(DUMMY)
 
-docker-clean: image-clean ##@Clean all existing images
+docker-clean: stop image-clean ##@Clean all existing images
 
 DOCKERHUB_IMAGES = baseimage engine mongo nginx operator-dashboard user-dashboard watchdog ansible-agent
 
diff --git a/docker/engine/Dockerfile.in b/docker/engine/Dockerfile.in
new file mode 100644
index 000000000..144b03c30
--- /dev/null
+++ b/docker/engine/Dockerfile.in
@@ -0,0 +1,12 @@
+# Copyright IBM Corp, All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+FROM _NS_/cello-baseimage:_TAG_
+
+# use this in development
+CMD ["python", "restserver.py"]
+
+# use this in product
+#CMD ["gunicorn", "-w", "128", "-b", "0.0.0.0:80", "restserver:app"]
+
diff --git a/docker/watchdog/Dockerfile.in b/docker/watchdog/Dockerfile.in
new file mode 100644
index 000000000..2b83b7b98
--- /dev/null
+++ b/docker/watchdog/Dockerfile.in
@@ -0,0 +1,8 @@
+# Copyright IBM Corp, All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+FROM _NS_/cello-baseimage:_TAG_
+
+# use this in development
+CMD ["python", "watchdog.py"]