mirror of
https://github.com/EpicMorg/docker-scripts.git
synced 2024-12-25 06:05:37 +03:00
fixes
This commit is contained in:
parent
665c8ca9f5
commit
499f0933da
@ -13,5 +13,4 @@
|
||||
### Nginx [![Nginx Mainline](https://img.shields.io/badge/Nginx_Mainline-1.15.2-ff69b4.svg?style=popout-square)](https://github.com/EpicMorg/docker-scripts/tree/master/balancer) [![](https://img.shields.io/docker/pulls/epicmorg/balancer.svg?style=popout-square)](https://hub.docker.com/r/epicmorg/balancer/)
|
||||
|
||||
### Apache2 + php7 [![Apache2](https://img.shields.io/badge/Apache2-2.4.34-ff69b4.svg?style=popout-square)](https://github.com/EpicMorg/docker-scripts/tree/master/websites) [![PHP7](https://img.shields.io/badge/PHP7-7.2.9-ff69b4.svg?style=popout-square)](https://github.com/EpicMorg/docker-scripts/tree/master/websites) [![](https://img.shields.io/docker/pulls/epicmorg/websites.svg?style=popout-square)](https://hub.docker.com/r/epicmorg/websites/ )
|
||||
|
||||
|
3
balancer/.dockerignore
Normal file
3
balancer/.dockerignore
Normal file
@ -0,0 +1,3 @@
|
||||
.git
|
||||
scripts
|
||||
.idea
|
@ -40,7 +40,5 @@ If Confluence is run behind a reverse proxy server, then you need to specify ext
|
||||
|
||||
If you need to pass additional JVM arguments to Confluence such as specifying a custom trust store, you can add them via the below environment variable
|
||||
|
||||
* `JVM_SUPPORT_RECOMMENDED_ARGS`
|
||||
|
||||
Additional JVM arguments for Confluence
|
||||
* `JVM_SUPPORT_RECOMMENDED_ARGS`
|
||||
|
||||
|
@ -39,4 +39,4 @@ RUN mkdir -p ${JIRA_INSTALL_DIR} \
|
||||
&& curl -L --silent ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \
|
||||
&& chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \
|
||||
&& sed -i -e 's/-Xms\([0-9]\+[kmg]\) -Xmx\([0-9]\+[kmg]\)/-Xms\${JVM_MINIMUM_MEMORY:=\1} -Xmx\${JVM_MAXIMUM_MEMORY:=\2} \${JVM_SUPPORT_RECOMMENDED_ARGS} -Dconfluence.home=\${JIRA_HOME}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \
|
||||
&& sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml
|
||||
&& sed -i -e 's/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml
|
@ -41,7 +41,3 @@ If Jira is run behind a reverse proxy server, then you need to specify extra opt
|
||||
If you need to pass additional JVM arguments to Jira such as specifying a custom trust store, you can add them via the below environment variable
|
||||
|
||||
* `JVM_SUPPORT_RECOMMENDED_ARGS`
|
||||
|
||||
Additional JVM arguments for Jira
|
||||
|
||||
|
1
websites/.docker-repository.yml
Normal file
1
websites/.docker-repository.yml
Normal file
@ -0,0 +1 @@
|
||||
repository: epicmorg/websites
|
3
websites/.dockerignore
Normal file
3
websites/.dockerignore
Normal file
@ -0,0 +1,3 @@
|
||||
.git
|
||||
scripts
|
||||
.idea
|
Loading…
Reference in New Issue
Block a user