diff --git a/6.13.7/Dockerfile b/6.13.7/Dockerfile index f49ae42f27b461e03329ea43ad384517546f396b..4b62c3de34281da22570d4f6c7e22e9fb04d6447 100755 --- a/6.13.7/Dockerfile +++ b/6.13.7/Dockerfile @@ -1,7 +1,14 @@ -ARG DOCKER_IMAGE=nexus-docker.52.61.140.4.nip.io/up/ubi7 -FROM $DOCKER_IMAGE +ARG BASE_REGISTRY=registry.access.redhat.com +ARG BASE_IMAGE=ubi7/ubi +ARG BASE_TAG=7.7 +FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} -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 +60,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 19173321ee2db609c98ed6a4a1b61052b27eb80d..b401c657748b2006bad969f5d4de95a2a56567c9 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= \ No newline at end of file +**1.** Build image + + docker build -t . + +**2.** Run image + + docker run -t -p 8090:8090 --net= -e NODES= diff --git a/6.13.7/config/loadbalancer-virtual-host.conf.jinja2 b/6.13.7/config/loadbalancer-virtual-host.conf.jinja2 index 49237828d5da3ec42e7765f18f41bdf578862b3b..0b9f835322d97f70b196b8cd487e5ee9dd6de415 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 %} - + ServerName {{ CONFLUENCE_LB_PUBLIC_HOST }} Require all granted @@ -8,12 +8,12 @@ {% 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 %} {% 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 %} ProxyPass /synchrony balancer://confluence-synchrony-cluster/synchrony stickysession=ROUTEID @@ -27,7 +27,7 @@ {% 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 %} ProxyPass / balancer://confluence-cluster/ stickysession=ROUTEID