diff --git a/README.md b/README.md index 85fb9d10e..f727a51b2 100644 --- a/README.md +++ b/README.md @@ -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/ ) - \ No newline at end of file diff --git a/balancer/.dockerignore b/balancer/.dockerignore new file mode 100644 index 000000000..f5523d40c --- /dev/null +++ b/balancer/.dockerignore @@ -0,0 +1,3 @@ +.git +scripts +.idea diff --git a/confluence/README.md b/confluence/README.md index 36e569dbe..d5e63d177 100644 --- a/confluence/README.md +++ b/confluence/README.md @@ -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` diff --git a/jira/Dockerfile b/jira/Dockerfile index 3795164bd..720a7f8ed 100644 --- a/jira/Dockerfile +++ b/jira/Dockerfile @@ -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 \ No newline at end of file + && sed -i -e 's/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml \ No newline at end of file diff --git a/jira/README.md b/jira/README.md index 84f4b6355..efcddf73b 100644 --- a/jira/README.md +++ b/jira/README.md @@ -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 - - \ No newline at end of file diff --git a/websites/.docker-repository.yml b/websites/.docker-repository.yml new file mode 100644 index 000000000..f5f1c309b --- /dev/null +++ b/websites/.docker-repository.yml @@ -0,0 +1 @@ +repository: epicmorg/websites diff --git a/websites/.dockerignore b/websites/.dockerignore new file mode 100644 index 000000000..f5523d40c --- /dev/null +++ b/websites/.dockerignore @@ -0,0 +1,3 @@ +.git +scripts +.idea