From a9ebf37e88f14fd7c2bd8b613885b5218d885d25 Mon Sep 17 00:00:00 2001 From: Matthew Aguirre Date: Mon, 19 Nov 2018 08:22:24 -0500 Subject: [PATCH 1/2] Added support for specifying JVM_SUPPORT_RECOMMENDED_ARGS --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3549bddf..43484452 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,6 +27,7 @@ RUN set -x \ && chown -R daemon:daemon "${JIRA_INSTALL}/temp" \ && chown -R daemon:daemon "${JIRA_INSTALL}/work" \ && sed --in-place "s/java version/openjdk version/g" "${JIRA_INSTALL}/bin/check-java.sh" \ + && sed -i 's/JVM_SUPPORT_RECOMMENDED_ARGS=""//g' "${JIRA_INSTALL}/bin/setenv.sh" \ && echo -e "\njira.home=$JIRA_HOME" >> "${JIRA_INSTALL}/atlassian-jira/WEB-INF/classes/jira-application.properties" \ && touch -d "@0" "${JIRA_INSTALL}/conf/server.xml" @@ -41,10 +42,10 @@ EXPOSE 8080 # Set volume mount points for installation and home directory. Changes to the # home directory needs to be persisted as well as parts of the installation # directory due to eg. logs. -VOLUME ["/var/atlassian/jira", "/opt/atlassian/jira/logs"] +VOLUME ["${JIRA_HOME}", "/opt/atlassian/jira/logs"] # Set the default working directory as the installation directory. -WORKDIR /var/atlassian/jira +WORKDIR /opt/atlassian/jira COPY "docker-entrypoint.sh" "/" ENTRYPOINT ["/docker-entrypoint.sh"] From d7b369ba6f91bb484dea497e2f20d33e8a4a1f93 Mon Sep 17 00:00:00 2001 From: Matthew Aguirre Date: Mon, 19 Nov 2018 08:27:41 -0500 Subject: [PATCH 2/2] Reset to /var/atlassian/jira --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 43484452..80d83406 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,7 +45,7 @@ EXPOSE 8080 VOLUME ["${JIRA_HOME}", "/opt/atlassian/jira/logs"] # Set the default working directory as the installation directory. -WORKDIR /opt/atlassian/jira +WORKDIR /var/atlassian/jira COPY "docker-entrypoint.sh" "/" ENTRYPOINT ["/docker-entrypoint.sh"]