EpicMorg/docker-scripts
2
1
Fork 0
mirror of https://github.com/EpicMorg/docker-scripts.git synced 2024-12-26 06:35:40 +03:00
Code Issues Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
STAM 2018-09-18 16:27:24 +03:00
parent 665c8ca9f5
commit 499f0933da
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -14,4 +14,3 @@
### 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/ ) ### 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
View File

@ -0,0 +1,3 @@
.git
scripts
.idea

2
confluence/README.md
View File

@ -42,5 +42,3 @@ If you need to pass additional JVM arguments to Confluence such as specifying a
* `JVM_SUPPORT_RECOMMENDED_ARGS` * `JVM_SUPPORT_RECOMMENDED_ARGS`
Additional JVM arguments for Confluence

2
jira/Dockerfile
View File

@ -39,4 +39,4 @@ RUN mkdir -p ${JIRA_INSTALL_DIR} \
&& curl -L --silent ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$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}/ \ && 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/-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

4
jira/README.md
View File

@ -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 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` * `JVM_SUPPORT_RECOMMENDED_ARGS`
Additional JVM arguments for Jira

1
websites/.docker-repository.yml Normal file
View File

@ -0,0 +1 @@
repository: epicmorg/websites

3
websites/.dockerignore Normal file
View File

@ -0,0 +1,3 @@
.git
scripts
.idea