From 4f2e6195c5a0519c9b72ecaf2f8b8401c9adc75f Mon Sep 17 00:00:00 2001
From: "O. Ruben Vila-Morales" <rmorales@ascendintegrated.com>
Date: Tue, 22 Oct 2019 12:06:41 -0700
Subject: [PATCH 1/2] Adjusted container to work without management script and
 config file

---
 6.13.7/Dockerfile                                   | 11 +++++++----
 6.13.7/README.md                                    | 11 +++++++++--
 6.13.7/config/loadbalancer-virtual-host.conf.jinja2 |  8 ++++----
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/6.13.7/Dockerfile b/6.13.7/Dockerfile
index f49ae42..b984eb0 100755
--- a/6.13.7/Dockerfile
+++ b/6.13.7/Dockerfile
@@ -1,7 +1,11 @@
-ARG DOCKER_IMAGE=nexus-docker.52.61.140.4.nip.io/up/ubi7
-FROM $DOCKER_IMAGE
+FROM nexus-docker.52.61.140.4.nip.io/up/ubi7
 
-ARG CONFLUENCE_LB_PUBLIC_PORT=8090
+#
+# ENVIRONMENT VARIABLES
+#
+ENV CONFLUENCE_LB_PUBLIC_HOST=confluence-cluster \
+	CONFLUENCE_LB_PUBLIC_PORT=8090 \
+	NODES=1
 
 #
 # BASE PACKAGES
@@ -53,7 +57,6 @@ EXPOSE $CONFLUENCE_LB_PUBLIC_PORT
 # RUN
 #
 USER worker
-ENV NODES 1
 ENV BASH_ENV=/opt/rh/python27/enable
 VOLUME ["/work"]
 ENTRYPOINT ["/work-private/docker-entrypoint.sh"]
diff --git a/6.13.7/README.md b/6.13.7/README.md
index 1917332..b401c65 100755
--- a/6.13.7/README.md
+++ b/6.13.7/README.md
@@ -1,3 +1,10 @@
-# Load Balancer
+# Confluence Data Center setup
+## confluence-load-balancer
 
-docker run -e LB_PUBLIC_PORT=<application_port> <image>  
\ No newline at end of file
+**1.** Build image
+
+	docker build -t <image_name> .
+
+**2.** Run image
+
+    docker run -t -p 8090:8090 --net=<network_name> -e NODES=<number_of_nodes> <image_name>
diff --git a/6.13.7/config/loadbalancer-virtual-host.conf.jinja2 b/6.13.7/config/loadbalancer-virtual-host.conf.jinja2
index 4923782..0b9f835 100755
--- a/6.13.7/config/loadbalancer-virtual-host.conf.jinja2
+++ b/6.13.7/config/loadbalancer-virtual-host.conf.jinja2
@@ -1,5 +1,5 @@
 {% set amountNodes = NODES | int %}
-<VirtualHost *:{{CONFLUENCE_LB_PUBLIC_PORT}}>
+<VirtualHost *:{{ CONFLUENCE_LB_PUBLIC_PORT }}>
     ServerName {{ CONFLUENCE_LB_PUBLIC_HOST }}
     <Proxy *>
         Require all granted
@@ -8,12 +8,12 @@
 
     <Proxy balancer://confluence-synchrony-cluster>
         {% for n in range(1, (amountNodes+1)) %}
-            BalancerMember http://confluence-cluster-{{ CONFLUENCE_VERSION_DOT_FREE }}-node{{ n }}:8091 route={{ n }}
+            BalancerMember http://confluence-cluster-node{{ n }}:8091 route={{ n }}
         {% endfor %}
     </Proxy>
     <Proxy balancer://confluence-synchrony-cluster-ws>
         {% for n in range(1, (amountNodes+1)) %}
-            BalancerMember ws://confluence-cluster-{{ CONFLUENCE_VERSION_DOT_FREE }}-node{{ n }}:8091 route={{ n }}
+            BalancerMember ws://confluence-cluster-node{{ n }}:8091 route={{ n }}
         {% endfor %}
     </Proxy>
     ProxyPass /synchrony balancer://confluence-synchrony-cluster/synchrony stickysession=ROUTEID
@@ -27,7 +27,7 @@
 
     <Proxy balancer://confluence-cluster>
         {% for n in range(1, (amountNodes+1)) %}
-            BalancerMember http://confluence-cluster-{{ CONFLUENCE_VERSION_DOT_FREE }}-node{{ n }}:8090 route={{ n }}
+            BalancerMember http://confluence-cluster-node{{ n }}:8090 route={{ n }}
         {% endfor %}
     </Proxy>
     ProxyPass / balancer://confluence-cluster/ stickysession=ROUTEID
-- 
GitLab


From abeaedf4f45b06bb4dbfbe68160371053786d966 Mon Sep 17 00:00:00 2001
From: Gerard Fulton <gfulton@redhat.com>
Date: Thu, 24 Oct 2019 15:30:07 +0000
Subject: [PATCH 2/2] Apply suggestion to 6.13.7/Dockerfile

---
 6.13.7/Dockerfile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/6.13.7/Dockerfile b/6.13.7/Dockerfile
index b984eb0..4b62c3d 100755
--- a/6.13.7/Dockerfile
+++ b/6.13.7/Dockerfile
@@ -1,4 +1,7 @@
-FROM nexus-docker.52.61.140.4.nip.io/up/ubi7
+ARG BASE_REGISTRY=registry.access.redhat.com
+ARG BASE_IMAGE=ubi7/ubi
+ARG BASE_TAG=7.7
+FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
 #
 # ENVIRONMENT VARIABLES
-- 
GitLab