mirror of
https://github.com/EpicMorg/docker-scripts.git
synced 2025-01-24 12:38:15 +03:00
Merge branch 'develop' into master
This commit is contained in:
commit
59aacdc0ac
@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive
|
||||
##################################################################
|
||||
# ARGuments
|
||||
##################################################################
|
||||
ARG JIRA_VERSION=8.12.0
|
||||
ARG JIRA_VERSION=8.12.1
|
||||
ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${JIRA_VERSION}.tar.gz
|
||||
|
||||
##################################################################
|
||||
@ -34,7 +34,6 @@ RUN mkdir -p ${JIRA_INSTALL_DIR} \
|
||||
&& sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \
|
||||
&& sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \
|
||||
&& sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \
|
||||
|
||||
update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
|
||||
apt clean -y && \
|
||||
apt autoclean -y && \
|
||||
|
@ -5,7 +5,7 @@ ARG DEBIAN_FRONTEND=noninteractive
|
||||
##################################################################
|
||||
# ARGuments
|
||||
##################################################################
|
||||
ARG JIRA_VERSION=8.12.0
|
||||
ARG JIRA_VERSION=8.12.1
|
||||
ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${JIRA_VERSION}.tar.gz
|
||||
|
||||
##################################################################
|
||||
|
Loading…
x
Reference in New Issue
Block a user