Merge branch 'newversion_helmchart_fixes' into 'master' (6d6da51c) · Commits · Iron Bank Containers / Atlassian / Jira Data Center / Jira Load Balancer

7.13.5/Dockerfile→7.13.11/Dockerfile

+14 −9

Original line number	Diff line number	Diff line
		ARG NEXUS_SERVER=nexus.52.61.140.4.nip.io
		ARG BASE_REGISTRY=registry.access.redhat.com
		ARG BASE_IMAGE=ubi7/ubi
		ARG BASE_TAG=7.7
		#
		# BASE IMAGE
		#
		ARG BASE_REGISTRY=nexus-docker.52.61.140.4.nip.io
		ARG BASE_IMAGE=redhat/ubi/ubi8
		ARG BASE_TAG=8.1
		FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}


		#
		# ENVIRONMENT VARIABLES
		#
		@@ -15,10 +16,9 @@ ENV JIRA_LB_PUBLIC_HOST=jira-cluster \
		#
		# BASE PACKAGES
		#
		RUN yum update -y --disableplugin=subscription-manager && \
		yum install -y --disableplugin=subscription-manager httpd python27-python-pip && \
		RUN yum install -y --nogpgcheck httpd python2-pip && \
		yum clean all && \
		scl enable python27 "pip install shinto-cli"
		pip2 install shinto-cli

		#
		# INSTALL
		@@ -58,11 +58,16 @@ COPY config/loadbalancer-virtual-host.conf.jinja2 /work-private
		WORKDIR /work
		EXPOSE $JIRA_LB_PUBLIC_PORT

		#
		# HEALTHCHECK
		#
		HEALTHCHECK --start-period=1m --interval=3m --timeout=3s \
		CMD curl -f http://localhost:$JIRA_LB_PUBLIC_PORT/ \|\| exit 1

		#
		# RUN
		#
		USER worker
		ENV BASH_ENV=/opt/rh/python27/enable
		VOLUME ["/work"]
		ENTRYPOINT ["/work-private/docker-entrypoint.sh"]
		CMD ["httpd", "-DFOREGROUND"]

+0 −0

File moved.

+0 −0

File moved.

+0 −0

File moved.

0 → 100755

+9 −0

Original line number	Diff line number	Diff line
		# jira-cluster-load-balancer helm chart setup
		## jira-cluster-load-balancer

		1. Run helm install

		helm install --set nodes=<nodes> jira-cluster jira-cluster-load-balancer

		# Notes
		Image repository in values.yaml should be replaced with actual repository.