mirror of
				https://github.com/kevinveenbirkenbach/computer-playbook.git
				synced 2025-11-04 12:18:17 +00:00 
			
		
		
		
	Confluence/Jira roles: add READMEs, switch to custom images, proxy/JVM envs, and integer-safe heap sizing
Confluence: README added; demo disables OIDC/LDAP; Dockerfile overlay; docker-compose now uses CONFLUENCE_CUSTOM_IMAGE and DB depends include; env.j2 adds ATL_* and JVM_*; vars use integer math (//) for Xmx/Xms and expose CUSTOM_IMAGE. Jira: initial role skeleton with README, config/meta/tasks; Dockerfile overlay; docker-compose using JIRA_CUSTOM_IMAGE and DB depends include; env.j2 with proxy + JVM envs; vars with integer-safe memory sizing. Context: https://chatgpt.com/share/68b6b592-2250-800f-b68e-b37ae98dbe70
This commit is contained in:
		@@ -0,0 +1,8 @@
 | 
			
		||||
FROM "{{ CONFLUENCE_IMAGE }}:{{ CONFLUENCE_VERSION }}"
 | 
			
		||||
 | 
			
		||||
# Optional: install OIDC SSO app (example path/name)
 | 
			
		||||
# COPY ./plugins/atlassian-sso-dc-latest.obr /opt/atlassian/confluence/confluence/WEB-INF/atlassian-bundled-plugins/
 | 
			
		||||
 | 
			
		||||
# Ensure proper permissions for app data
 | 
			
		||||
RUN mkdir -p /var/atlassian/application-data/confluence && \
 | 
			
		||||
    chown -R 2001:2001 /var/atlassian/application-data/confluence
 | 
			
		||||
@@ -3,9 +3,7 @@
 | 
			
		||||
    build:
 | 
			
		||||
      context: .
 | 
			
		||||
      dockerfile: Dockerfile
 | 
			
		||||
      args:
 | 
			
		||||
        CONFLUENCE_BASE_IMAGE: "{{ CONFLUENCE_IMAGE }}:{{ CONFLUENCE_VERSION }}"
 | 
			
		||||
    image: "{{ CONFLUENCE_IMAGE }}:{{ CONFLUENCE_VERSION }}-oidc"
 | 
			
		||||
    image: "{{ CONFLUENCE_CUSTOM_IMAGE }}"
 | 
			
		||||
    container_name: "{{ CONFLUENCE_CONTAINER }}"
 | 
			
		||||
    hostname: '{{ CONFLUENCE_HOSTNAME}}'
 | 
			
		||||
    ports:
 | 
			
		||||
@@ -14,8 +12,7 @@
 | 
			
		||||
      - 'data:/var/atlassian/application-data/confluence'
 | 
			
		||||
{% include 'roles/docker-container/templates/healthcheck/curl.yml.j2' %}
 | 
			
		||||
{% include 'roles/docker-container/templates/base.yml.j2' %}
 | 
			
		||||
    depends_on:
 | 
			
		||||
      - database
 | 
			
		||||
{% include 'roles/docker-container/templates/depends_on/dmbs_excl.yml.j2' %}
 | 
			
		||||
{% include 'roles/docker-container/templates/networks.yml.j2' %}
 | 
			
		||||
 | 
			
		||||
{% include 'roles/docker-compose/templates/volumes.yml.j2' %}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,13 @@
 | 
			
		||||
## Confluence core
 | 
			
		||||
CONFLUENCE_URL="{{ CONFLUENCE_URL }}"
 | 
			
		||||
 | 
			
		||||
ATL_PROXY_NAME={{ CONFLUENCE_HOSTNAME }}
 | 
			
		||||
ATL_PROXY_PORT={{ WEB_PORT }}
 | 
			
		||||
ATL_TOMCAT_SCHEME={{ WEB_PROTOCOL }}
 | 
			
		||||
ATL_TOMCAT_SECURE={{ (WEB_PORT == 443) | lower }}
 | 
			
		||||
JVM_MINIMUM_MEMORY={{ CONFLUENCE_JVM_MIN }}
 | 
			
		||||
JVM_MAXIMUM_MEMORY={{ CONFLUENCE_JVM_MAX }}
 | 
			
		||||
 | 
			
		||||
## Database
 | 
			
		||||
CONFLUENCE_DATABASE_NAME="{{ database_name }}"
 | 
			
		||||
CONFLUENCE_DATABASE_USER="{{ database_username }}"
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user