From a6123ffebb77f23d5182576be17e69d62fd8d701 Mon Sep 17 00:00:00 2001
From: Joseph Richard <joseph.richard@windriver.com>
Date: Wed, 22 Jul 2020 12:09:06 -0400
Subject: [PATCH] Build portieris docker image

Build portieris docker image based off of most recent (0.7.0) tag.  This
will enable additional commits to be included without requiring a new
release of upstream portieris.  This will be able to be upversioned when
a new portieris version is released, with patches being dropped.

Story: 2007348
Task: 40415
Change-Id: I729398b32a8fcb642ca6f3265b5116dd86122b7f
Signed-off-by: Joseph Richard <joseph.richard@windriver.com>
---
 centos_pkg_dirs                                            | 2 +-
 centos_pkg_dirs_containers                                 | 2 +-
 centos_stable_docker_images.inc                            | 1 +
 portieris-helm/centos/portieris.stable_docker_image        | 4 ++++
 .../stx-portieris-helm/manifests/manifest.yaml             | 7 ++++---
 5 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 centos_stable_docker_images.inc
 create mode 100644 portieris-helm/centos/portieris.stable_docker_image

diff --git a/centos_pkg_dirs b/centos_pkg_dirs
index 3b5e943..a8e3f1d 100644
--- a/centos_pkg_dirs
+++ b/centos_pkg_dirs
@@ -1,2 +1,2 @@
 portieris-helm
-stx-portieris-helm
\ No newline at end of file
+stx-portieris-helm
diff --git a/centos_pkg_dirs_containers b/centos_pkg_dirs_containers
index 3b5e943..a8e3f1d 100644
--- a/centos_pkg_dirs_containers
+++ b/centos_pkg_dirs_containers
@@ -1,2 +1,2 @@
 portieris-helm
-stx-portieris-helm
\ No newline at end of file
+stx-portieris-helm
diff --git a/centos_stable_docker_images.inc b/centos_stable_docker_images.inc
new file mode 100644
index 0000000..8aebb53
--- /dev/null
+++ b/centos_stable_docker_images.inc
@@ -0,0 +1 @@
+portieris-helm
diff --git a/portieris-helm/centos/portieris.stable_docker_image b/portieris-helm/centos/portieris.stable_docker_image
new file mode 100644
index 0000000..1ec9b19
--- /dev/null
+++ b/portieris-helm/centos/portieris.stable_docker_image
@@ -0,0 +1,4 @@
+BUILDER=docker
+LABEL=portieris
+DOCKER_REPO=https://github.com/IBM/portieris.git
+DOCKER_REF=0.7.0
diff --git a/stx-portieris-helm/stx-portieris-helm/manifests/manifest.yaml b/stx-portieris-helm/stx-portieris-helm/manifests/manifest.yaml
index a670eee..2758d5e 100644
--- a/stx-portieris-helm/stx-portieris-helm/manifests/manifest.yaml
+++ b/stx-portieris-helm/stx-portieris-helm/manifests/manifest.yaml
@@ -52,11 +52,12 @@ data:
     namespace: portieris
     images:
       tags:
-        portieris: docker.io/ibmcom/portieris:0.7.0
+        portieris: docker.io/starlingx/portieris:master-centos-stable-latest
     image:
-      host: docker.io/ibmcom
+      host: registry.local:9001/docker.io/starlingx
       image: portieris
-      tags: 0.7.0
+      tags: master-centos-stable-latest
+      tag: master-centos-stable-latest
     IBMContainerService: false
     SkipSecretCreation: true
     UseCertManager: true