diff --git a/6.13.10/Dockerfile b/Dockerfile similarity index 81% rename from 6.13.10/Dockerfile rename to Dockerfile index eb1d8c56841fb2e1e8413e405845270db8bb8ab9..9032fcbe9c60edcd384a34705094c299e3ad7a7a 100755 --- a/6.13.10/Dockerfile +++ b/Dockerfile @@ -15,10 +15,26 @@ 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.7.2.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 --nogpgcheck httpd python2-pip && \ - yum clean all && \ - pip2 install shinto-cli + 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} # # ERROR LOG, USER diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000000000000000000000000000000000000..5f0b519860033439319ce4cafce265457434e480 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,3 @@ +@Library('DCCSCR@master') _ +dccscrPipeline() + diff --git a/6.13.10/LICENSE b/LICENSE similarity index 100% rename from 6.13.10/LICENSE rename to LICENSE diff --git a/6.13.10/README.md b/README.md similarity index 100% rename from 6.13.10/README.md rename to README.md diff --git a/6.13.10/config/loadbalancer-virtual-host.conf.jinja2 b/config/loadbalancer-virtual-host.conf.jinja2 similarity index 100% rename from 6.13.10/config/loadbalancer-virtual-host.conf.jinja2 rename to config/loadbalancer-virtual-host.conf.jinja2 diff --git a/download.yaml b/download.yaml new file mode 100644 index 0000000000000000000000000000000000000000..b7384f939f3a6fdcb6723decc18f56a8178d55ff --- /dev/null +++ b/download.yaml @@ -0,0 +1,16 @@ +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 diff --git a/6.13.10/helm/README.md b/helm/README.md similarity index 100% rename from 6.13.10/helm/README.md rename to helm/README.md diff --git a/6.13.10/helm/confluence-cluster-load-balancer/.helmignore b/helm/confluence-cluster-load-balancer/.helmignore similarity index 100% rename from 6.13.10/helm/confluence-cluster-load-balancer/.helmignore rename to helm/confluence-cluster-load-balancer/.helmignore diff --git a/6.13.10/helm/confluence-cluster-load-balancer/Chart.yaml b/helm/confluence-cluster-load-balancer/Chart.yaml similarity index 100% rename from 6.13.10/helm/confluence-cluster-load-balancer/Chart.yaml rename to helm/confluence-cluster-load-balancer/Chart.yaml diff --git a/6.13.10/helm/confluence-cluster-load-balancer/templates/_helpers.tpl b/helm/confluence-cluster-load-balancer/templates/_helpers.tpl similarity index 100% rename from 6.13.10/helm/confluence-cluster-load-balancer/templates/_helpers.tpl rename to helm/confluence-cluster-load-balancer/templates/_helpers.tpl diff --git a/6.13.10/helm/confluence-cluster-load-balancer/templates/deployment.yaml b/helm/confluence-cluster-load-balancer/templates/deployment.yaml similarity index 100% rename from 6.13.10/helm/confluence-cluster-load-balancer/templates/deployment.yaml rename to helm/confluence-cluster-load-balancer/templates/deployment.yaml diff --git a/6.13.10/helm/confluence-cluster-load-balancer/templates/ingress.yaml b/helm/confluence-cluster-load-balancer/templates/ingress.yaml similarity index 100% rename from 6.13.10/helm/confluence-cluster-load-balancer/templates/ingress.yaml rename to helm/confluence-cluster-load-balancer/templates/ingress.yaml diff --git a/6.13.10/helm/confluence-cluster-load-balancer/templates/service.yaml b/helm/confluence-cluster-load-balancer/templates/service.yaml similarity index 100% rename from 6.13.10/helm/confluence-cluster-load-balancer/templates/service.yaml rename to helm/confluence-cluster-load-balancer/templates/service.yaml diff --git a/6.13.10/helm/confluence-cluster-load-balancer/templates/serviceaccount.yaml b/helm/confluence-cluster-load-balancer/templates/serviceaccount.yaml similarity index 100% rename from 6.13.10/helm/confluence-cluster-load-balancer/templates/serviceaccount.yaml rename to helm/confluence-cluster-load-balancer/templates/serviceaccount.yaml diff --git a/6.13.10/helm/confluence-cluster-load-balancer/values.yaml b/helm/confluence-cluster-load-balancer/values.yaml similarity index 100% rename from 6.13.10/helm/confluence-cluster-load-balancer/values.yaml rename to helm/confluence-cluster-load-balancer/values.yaml diff --git a/6.13.10/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh similarity index 100% rename from 6.13.10/scripts/docker-entrypoint.sh rename to scripts/docker-entrypoint.sh