From 62399a0a92e8999c3ea83a1d21f00fd90993de2e Mon Sep 17 00:00:00 2001 From: Ruben Morales Date: Wed, 20 May 2020 10:57:58 -0400 Subject: [PATCH 1/3] confluence_lb_7.4.0 --- Dockerfile | 1 - Jenkinsfile | 3 +-- README.md | 26 +++++++++++++++++++++++++- download.json | 27 +++++++++++++++++++++++++++ download.yaml | 16 ---------------- 5 files changed, 53 insertions(+), 20 deletions(-) create mode 100644 download.json delete mode 100644 download.yaml diff --git a/Dockerfile b/Dockerfile index a0e73a0..229b161 100755 --- a/Dockerfile +++ b/Dockerfile @@ -54,7 +54,6 @@ RUN ln -sf /dev/stderr /var/log/httpd/error_log && \ chown -R worker:worker /var/log/httpd && \ chown -R worker:worker /run/httpd && \ sed -i -e 's/Listen 80/Listen ${CONFLUENCE_LB_PUBLIC_PORT}\nServerName localhost/g' /etc/httpd/conf/httpd.conf && \ - sed -i -e 's/AllowOverride\s*None/AllowOverride All/ig' /etc/httpd/conf/httpd.conf && \ echo "Include /work-private/loadbalancer-virtual-host.conf" >> /etc/httpd/conf/httpd.conf # diff --git a/Jenkinsfile b/Jenkinsfile index d225425..7f1f3c2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,3 +1,2 @@ @Library('DCCSCR@master') _ -dccscrPipeline(version: '6.13.10') - +dccscrPipeline(version: "7.4.0") diff --git a/README.md b/README.md index b401c65..fe0d49b 100755 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ -# Confluence Data Center setup +# Confluence Data Center ## confluence-load-balancer +### Build and run image + **1.** Build image docker build -t . @@ -8,3 +10,25 @@ **2.** Run image docker run -t -p 8090:8090 --net= -e NODES= + +### Recommended resource requirements + +**1.** Min/max cpu + + 1/- + +**2.** Min/max memory + + 1gb/- + +**3.** Storage min/max/limits + + 10gb/-/- + +**4.** How many storage volumes the application needs + + 1 + +**5.** Max number of containers + + n/a diff --git a/download.json b/download.json new file mode 100644 index 0000000..966022b --- /dev/null +++ b/download.json @@ -0,0 +1,27 @@ +{ "resources": + [ + { "url" : "https://files.pythonhosted.org/packages/source/m/markupsafe/MarkupSafe-1.1.1.tar.gz", + "filename": "MarkupSafe-1.1.1.tar.gz", + "validation": + { + "type": "sha256", + "value": "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b" + } + }, + { "url" : "https://files.pythonhosted.org/packages/source/j/jinja2/Jinja2-2.11.1.tar.gz", + "filename": "Jinja2-2.11.1.tar.gz", + "validation": + { + "type": "sha256", + "value": "93187ffbc7808079673ef52771baa950426fd664d3aad1d0fa3e95644360e250" + } + }, + { "url" : "https://files.pythonhosted.org/packages/source/s/shinto-cli/shinto-cli-0.5.0.tar.gz", + "filename": "shinto-cli-0.5.0.tar.gz", + "validation": + { + "type": "sha256", + "value": "c142e75c34ecd8d04a6200b23464e084ad54ca598e358d70b958044e6b628c95" + } + } +] } diff --git a/download.yaml b/download.yaml deleted file mode 100644 index b7384f9..0000000 --- a/download.yaml +++ /dev/null @@ -1,16 +0,0 @@ -resources: - - url: https://files.pythonhosted.org/packages/15/59/9f8f85a52e13dcabc69110f88eb7ed5733a631b26f10be586168ee57cba9/shinto-cli-0.5.0.tar.gz - filename: shinto-cli-0.5.0.tar.gz - validation: - type: sha256 - value: c142e75c34ecd8d04a6200b23464e084ad54ca598e358d70b958044e6b628c95 - - url: https://files.pythonhosted.org/packages/23/94/ca42176bf7a252ce1f5d165953013573dffdbe4b5dac07f57146146ea432/Jinja2-2.7.2.tar.gz - filename: Jinja2-2.7.2.tar.gz - validation: - type: sha256 - value: 310a35fbccac3af13ebf927297f871ac656b9da1d248b1fe6765affa71b53235 - - url: https://files.pythonhosted.org/packages/b9/2e/64db92e53b86efccfaea71321f597fa2e1b2bd3853d8ce658568f7a13094/MarkupSafe-1.1.1.tar.gz - filename: MarkupSafe-1.1.1.tar.gz - validation: - type: sha256 - value: 29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b \ No newline at end of file -- GitLab From 2e96dd3baff1932a35416bba9829e2def38225cf Mon Sep 17 00:00:00 2001 From: Ruben Morales Date: Wed, 20 May 2020 11:12:53 -0400 Subject: [PATCH 2/3] Corrected Jinja2 version issue --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 229b161..68887b2 100755 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ ENV CONFLUENCE_LB_PUBLIC_HOST=confluence-cluster \ # Jinja2 2.11.1 # MarkupSafe 1.1.1 ARG SHINTO=shinto-cli-0.5.0.tar.gz -ARG JINJA=Jinja2-2.7.2.tar.gz +ARG JINJA=Jinja2-2.11.1.tar.gz ARG MARKUPSAFE=MarkupSafe-1.1.1.tar.gz COPY ${SHINTO} /tmp/${SHINTO} -- GitLab From 393d01e7c04e36dfa3884c52648e23cb81e7c217 Mon Sep 17 00:00:00 2001 From: Ruben Vila-Morales Date: Thu, 28 May 2020 14:18:16 -0400 Subject: [PATCH 3/3] merged with commit from development branch --- Dockerfile | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/Dockerfile b/Dockerfile index 68887b2..c43141f 100755 --- a/Dockerfile +++ b/Dockerfile @@ -6,6 +6,17 @@ ARG BASE_IMAGE=redhat/ubi/ubi8 ARG BASE_TAG=8.2 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} +# +# LABEL +# +LABEL name="Confluence Load Balancer" \ + maintainer="support@ascendintegrated.com" \ + vendor="Apache" \ + version="6.13.10" \ + release="1" \ + summary="Confluence Load Balancer Image" \ + description="Confluence Load Balancer Image" + # # ENVIRONMENT VARIABLES # @@ -15,26 +26,17 @@ ENV CONFLUENCE_LB_PUBLIC_HOST=confluence-cluster \ # # BASE PACKAGES -# shinto 0.5.0 -# Dependencies of Shinto CLI -# Jinja2 2.11.1 -# MarkupSafe 1.1.1 -ARG SHINTO=shinto-cli-0.5.0.tar.gz -ARG JINJA=Jinja2-2.11.1.tar.gz -ARG MARKUPSAFE=MarkupSafe-1.1.1.tar.gz - -COPY ${SHINTO} /tmp/${SHINTO} -COPY ${JINJA} /tmp/${JINJA} -COPY ${MARKUPSAFE} /tmp/${MARKUPSAFE} - -RUN yum install -y httpd python2-pip && \ - yum clean all - -RUN pip2 install /tmp/${MARKUPSAFE} -RUN pip2 install /tmp/${JINJA} -RUN pip2 install /tmp/${SHINTO} - -RUN rm -f /tmp/${SHINTO} /tmp/${JINJA} +# +ARG TARBALL1=MarkupSafe-1.1.1.tar.gz +ARG TARBALL2=Jinja2-2.11.1.tar.gz +ARG TARBALL3=shinto-cli-0.5.0.tar.gz +COPY ["${TARBALL1}", "${TARBALL2}", "${TARBALL3}", "/tmp/"] +RUN yum update -y && \ + yum install -y httpd python3-pip && \ + yum clean all && \ + pip3 install /tmp/${TARBALL1} /tmp/${TARBALL2} /tmp/${TARBALL3} && \ + rm -rfv /var/cache/yum && \ + rm -f /tmp/${TARBALL1} /tmp/${TARBALL2} /tmp/${TARBALL3} # # ERROR LOG, USER @@ -53,7 +55,7 @@ RUN ln -sf /dev/stderr /var/log/httpd/error_log && \ touch /var/www/logs/access.log && chown -R worker:worker /var/www/logs/access.log && \ chown -R worker:worker /var/log/httpd && \ chown -R worker:worker /run/httpd && \ - sed -i -e 's/Listen 80/Listen ${CONFLUENCE_LB_PUBLIC_PORT}\nServerName localhost/g' /etc/httpd/conf/httpd.conf && \ + sed -i -e "s/Listen 80/Listen ${CONFLUENCE_LB_PUBLIC_PORT}\nServerName localhost/g" /etc/httpd/conf/httpd.conf && \ echo "Include /work-private/loadbalancer-virtual-host.conf" >> /etc/httpd/conf/httpd.conf # -- GitLab