diff --git a/.github/workflows/torrserver-temp.yml b/.github/workflows/torrserver-temp.yml
new file mode 100644
index 000000000..a2c4fd324
--- /dev/null
+++ b/.github/workflows/torrserver-temp.yml
@@ -0,0 +1,33 @@
+name: torrserver-temp
+
+on:
+# push:
+# branches:
+# - 'develop'
+ schedule:
+ - cron: '0 0 * * *' # At the end of every day
+
+jobs:
+
+ build-forked-fixed-independed-images:
+ name: TorrServer image
+ runs-on: ubuntu-20.04
+
+ steps:
+ - uses: actions/checkout@v2
+ - name: Log into registry
+ run: echo "${{ secrets.DOCKER_SERVER_KEY }}" | docker login -u "${{ secrets.DOCKER_SERVER_LOGIN }}" --password-stdin
+
+ - name: Test Make
+ run: make
+
+ - name: Docker Compose Update
+ run: make docker-compose-update
+
+##################################################################################
+
+ - name: Build TorrServer
+ run: cd linux/ecosystem/torrserver && make build
+
+ - name: Push TorrServer
+ run: cd linux/ecosystem/torrserver && make deploy
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..b544ba297
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "linux/advanced/redash/redash-repo"]
+ path = linux/advanced/redash/redash-repo
+ url = git@github.com:getredash/redash.git
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fdc1f75b3..f974020e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,35 @@
## Changelog
### 2021
+* `october-november`
+ * added `nginx:quic` image. UNSTABLE.
+ * added `redash:latest` image in to `advanced` pack.
+ * improved `Makefile`s.
+ * fixed `nextcloud` images.
+ * splited `nextcloud` images to `pure` and `patched` (`zipstreamer`) tags.
+ * added `torrserver`
+ * added `advanced` image of `vcsode server`. original image by [linuxserver/docker-code-server](https://github.com/linuxserver/docker-code-server).
+* `september`
+ * added [ArekSredzki/electron-release-server](https://github.com/ArekSredzki/electron-release-server/) support.
+ * fully reworked `teamcity-agent` images.
+ * added `java 16` support to base images.
+ * moved images to `advanced` and `ecosystem` folders.
+ * migrated from `country code` to `httpredir` (more stable) official `debian` mirror.
+ * `nginx 1.21.3`.
+* `august`
+ * splited `tc-agents` with `nodejs`
+ * fixed `PostgreSQL` images
+ * added `PostgreSQL 13` and `PostgreSQL 14`. `latest` tag symlinked to `14`.
+* `july`
+ * nothing
+* `june`
+ * migrated to `docker-compose` build-system.
+ * added older versions of `nginx`.
+* `may`
+ * @kasthack was wrote docker-template generator for atlassian products
+ * was regenerated and updated *all* `jira` images with `5`, `6`, `7` and `8` versions.
+ * was regenerated and updated *all* `fisheye-crucible` images with `2`, `3` and `4` versions.
+ * all actual download links was get from [EpicMorg/atlassian-json](https://github.com/EpicMorg/atlassian-json) repo.
+ * asap will be updated and added all additional `atlassian` images.
* `april`
* updated `nextcloud` images
* `[BREAKING CHANGES]` reorganized space - `linux` and `win32` folders
diff --git a/DESCRIPTION.md b/DESCRIPTION.md
new file mode 100644
index 000000000..fb86c58aa
--- /dev/null
+++ b/DESCRIPTION.md
@@ -0,0 +1,58 @@
+# [](https://github.com/EpicMorg/docker-scripts/commits) [](https://github.com/EpicMorg/docker-scripts/issues) [](https://github.com/EpicMorg/docker-scripts/network) [](https://github.com/EpicMorg/docker-scripts/stargazers) [](https://github.com/EpicMorg/docker-scripts/archive/master.zip) [](https://github.com/EpicMorg/docker-scripts/releases) [](https://bestpractices.coreinfrastructure.org/projects/3658) [](https://codescene.io/projects/6535) [](LICENSE.md) [](CHANGELOG.md)
+
+| Master | Develop |
+|:-------------|:-------------|
+| [](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Amaster-linux) | [](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Adevelop-linux)
+| [](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Amaster-win32) | [](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Adevelop-win32)
+
+## Description
+A collection of docker images for production use. This repo contains 2 types of images - `advanced` and `ecosystem`. We support `linux x86_64` docker engine (`Win64` is still in the ***testing*** stage).
+
+* `linux/advanced` folder contains improved images like `nextcloud` or `teamcity server`, `zabbix collection`, etc. These images just forked from original developers and patched a bit.
+* `linux/ecosystem` folder contains images developed by our team like full `Atlassian Stack`, compilled `nginx`, `php`, `testrail` and othres.
+
+
+
+## Quick navigation for sub-repositories
+Containers was Splited to another sub-repositories. Now current repo will be contain only fresh and latest versions of images. All older versions will be appeared in sub-repos. More fater building, less bad load to CI.
+
+| Bitbucket | Confluence | Jira | EpicMorg |
+|-------------:|-------------:|:-------------|:-------------|
+| [](https://github.com/EpicMorg/docker-scripts/tree/master/atlassian/bitbucket/7) [](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Amaster) | [](https://github.com/EpicMorg/docker-scripts/tree/master/atlassian/confluence/7) [](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Amaster) | [](https://github.com/EpicMorg/docker-scripts/tree/master/atlassian/jira/8) [](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Amaster) | [](https://github.com/EpicMorgVault/docker-deprecated-images) [](https://github.com/EpicMorgVault/docker-deprecated-images) |
+| [](https://github.com/EpicMorg/docker-scripts/tree/master/atlassian/bitbucket/6) [](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Amaster) | [](https://github.com/EpicMorg/docker-scripts/tree/master/atlassian/confluence/6) [](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Amaster) | [](https://github.com/EpicMorg/docker-scripts/tree/master/atlassian/jira/7) [](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Amaster) | [](https://github.com/EpicMorgVault/docker-experimental-images) [](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Atesting) |
+| ` ` | [](https://github.com/EpicMorg/docker-scripts/tree/master/atlassian/confluence/5) [](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Amaster) | [](https://github.com/EpicMorg/docker-scripts/tree/master/atlassian/jira/6) [](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Amaster) | [](https://github.com/EpicMorg/docker-scripts/tree/master/nextcloud) [](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Amaster) |
+| ` ` | ` ` | [](https://github.com/EpicMorg/docker-scripts/tree/master/atlassian/jira/5) [](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Amaster) | [](https://github.com/EpicMorg/docker-scripts/tree/master/postgres) [](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Amaster) | |
+
+# Some popular products [](https://ko-fi.com/B0B81CUI4)
+
+| Application | Pulls | Notes
+| ------ | ------ | ------
+| [](https://www.atlassian.com/software/bitbucket/download) | [](https://hub.docker.com/r/epicmorg/bitbucket/) | `Atlassian Bitbucket` server. You also can install `datacenter` edition.
+| [](https://www.atlassian.com/software/confluence/download) | [](https://hub.docker.com/r/epicmorg/confluence/) | `Atlassian Confluence` server. You also can install `datacenter` edition.
+| [](https://www.atlassian.com/software/jira/download) | [](https://hub.docker.com/r/epicmorg/jira/) | `Atlassian Jira: Softrware` server. You also can install `servicedesk`, `core` or `datacenter` editions.
+| [](https://nginx.org/en/download.html) | [](https://hub.docker.com/r/epicmorg/nginx/) | Mainline custom build by [EpicMorg Team](https://github.com/EpicMorg) with http2 support and some modules.
+| [](https://deb.sury.org/) | [](https://hub.docker.com/r/epicmorg/apache2/ ) | Latest pure apache2.
+| [](https://deb.sury.org/) | [](https://hub.docker.com/r/epicmorg/apache2/ ) | php 7.3 custom build by [Ondrej Sury](https://launchpad.net/~ondrej). Component of container above.
+| [](https://hub.docker.com/_/nextcloud) | [](https://hub.docker.com/r/epicmorg/nextcloud/ ) | Fixed `nextcloud:latest` build by [EpicMorg Team](https://github.com/EpicMorg) with benefits.
+| [](https://github.com/zabbix/zabbix-docker) | [](https://hub.docker.com/r/epicmorg/zabbix-agent/ ) | Fixed `zabbix/zabbix-agent:ubuntu-latest` build by [EpicMorg Team](https://github.com/EpicMorg) with benefits.
+| [](https://github.com/zabbix/zabbix-docker) | [](https://hub.docker.com/r/epicmorg/zabbix-server-mysql/ ) | Fixed `zabbix/zabbix-server-mysql:ubuntu-latest` build by [EpicMorg Team](https://github.com/EpicMorg) with benefits.
+| [](https://github.com/zabbix/zabbix-docker) | [](https://hub.docker.com/r/epicmorg/zabbix-web-apache-mysql/ ) | Fixed `zabbix/zabbix-web-apache-mysql:ubuntu-latest` build by [EpicMorg Team](https://github.com/EpicMorg) with benefits.
+| [](https://github.com/zabbix/zabbix-docker) | [](https://hub.docker.com/r/epicmorg/zabbix-java-gateway/ ) | Fixed `zabbix/zabbix-java-gateway:ubuntu-latest` build by [EpicMorg Team](https://github.com/EpicMorg) with benefits.
+| [](https://github.com/JetBrains/teamcity-docker-agent) | [](https://hub.docker.com/r/epicmorg/teamcity-agent/ ) | Custom build by [EpicMorg Team](https://github.com/EpicMorg) with benefits.
+| [](https://github.com/qbittorrent/qBittorrent) | [](https://hub.docker.com/r/epicmorg/qbittorrent/ ) | Custom build by [EpicMorg Team](https://github.com/EpicMorg) with benefits.
+
+# Containers Map
+
+
+
+# Stargazers
+[](https://github.com/EpicMorg/docker-scripts/stargazers)
+
+# Forkers
+[](https://github.com/EpicMorg/docker-scripts/network/members)
+
+# ↳ Special Thanks:
+
+* [@Aleks-Z](https://github.com/Aleks-Z)
+* [@alex4rks](https://github.com/alex4rks)
+* [@kasthack](https://github.com/kasthack)
diff --git a/Makefile b/Makefile
new file mode 100644
index 000000000..45c727963
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,178 @@
+VERSION = "2021.11.12"
+AUTHOR = "EpicMorg"
+MODIFIED = "AlexZ"
+DOCKER_SCAN_SUGGEST = false
+
+all: app
+
+app:
+ @make -s version
+ @make -s help
+
+version:
+ @echo "=================================================="
+ @echo " docker-scripts, version: ${VERSION}, [` git branch --show-current `]"
+ @echo "=================================================="
+
+help:
+ @echo "make help - show this help."
+ @echo "make version - show version of this repository."
+ @echo "make docker-compose-install - local install latest version of docker-compose binary."
+ @echo "make docker-compose-update - update local docker-compose binary."
+ @echo "make docker-clean - cleanup docker kitchen."
+ @echo "make chmod - find and fix chmod of '*.sh' and '*.py' files."
+ @echo "make advanced-images - build only advanced images."
+ @echo "make ecosystem-images - build ecosystem images."
+ @echo "make images - build all images."
+
+chmod:
+ find . -name '*.sh' -type f | xargs chmod +x
+ find . -name '*.py' -type f | xargs chmod +x
+
+docker-compose-install:
+ @make -s docker-compose-update
+
+docker-compose-update:
+ @bash ./bin/docker-compose-update.sh
+
+docker-clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
+
+images:
+ make docker-clean
+ make advanced-images
+ make docker-clean
+ make ecosystem-images
+ make docker-clean
+
+advanced-images:
+ @echo "======================================="
+ @echo "===== Building third-party images ====="
+ @echo "======================================="
+
+ cd `pwd`/linux/advanced/zabbix/agent && pwd && make
+ cd `pwd`/linux/advanced/zabbix/java-gateway && pwd && make
+ cd `pwd`/linux/advanced/zabbix/proxy && pwd && make
+ cd `pwd`/linux/advanced/zabbix/server && pwd && make
+ cd `pwd`/linux/advanced/zabbix/web && pwd && make
+
+ cd `pwd`/linux/advanced/mattermost && pwd && make
+ cd `pwd`/linux/advanced/nextcloud/pure/latest && pwd && make
+ cd `pwd`/linux/advanced/nextcloud/patched/latest && pwd && make
+ cd `pwd`/linux/advanced/teamcity/server && pwd && make
+ cd `pwd`/linux/advanced/redash && pwd && make
+
+ cd `pwd`/linux/advanced/nextcloud/pure/14 && pwd && make
+ cd `pwd`/linux/advanced/nextcloud/pure/15 && pwd && make
+ cd `pwd`/linux/advanced/nextcloud/pure/16 && pwd && make
+ cd `pwd`/linux/advanced/nextcloud/pure/17 && pwd && make
+ cd `pwd`/linux/advanced/nextcloud/pure/18 && pwd && make
+ cd `pwd`/linux/advanced/nextcloud/pure/19 && pwd && make
+ cd `pwd`/linux/advanced/nextcloud/pure/20 && pwd && make
+ cd `pwd`/linux/advanced/nextcloud/pure/21 && pwd && make
+ cd `pwd`/linux/advanced/nextcloud/pure/22 && pwd && make
+
+ cd `pwd`/linux/advanced/nextcloud/patched/14 && pwd && make
+ cd `pwd`/linux/advanced/nextcloud/patched/15 && pwd && make
+ cd `pwd`/linux/advanced/nextcloud/patched/16 && pwd && make
+ cd `pwd`/linux/advanced/nextcloud/patched/17 && pwd && make
+ cd `pwd`/linux/advanced/nextcloud/patched/18 && pwd && make
+ cd `pwd`/linux/advanced/nextcloud/patched/19 && pwd && make
+ cd `pwd`/linux/advanced/nextcloud/patched/20 && pwd && make
+ cd `pwd`/linux/advanced/nextcloud/patched/21 && pwd && make
+ cd `pwd`/linux/advanced/nextcloud/patched/22 && pwd && make
+
+ecosystem-images:
+ @echo "======================================="
+ @echo "===== Building EpicMorg images ====="
+ @echo "======================================="
+
+ cd `pwd`/linux/ecosystem/epicmorg/prod/main && pwd && make
+ cd `pwd`/linux/ecosystem/epicmorg/prod/jdk6 && pwd && make
+ cd `pwd`/linux/ecosystem/epicmorg/prod/jdk7 && pwd && make
+ cd `pwd`/linux/ecosystem/epicmorg/prod/jdk8 && pwd && make
+ cd `pwd`/linux/ecosystem/epicmorg/prod/jdk11 && pwd && make
+ cd `pwd`/linux/ecosystem/epicmorg/prod/jdk16 && pwd && make
+
+ cd `pwd`/linux/ecosystem/epicmorg/edge/main && pwd && make
+ cd `pwd`/linux/ecosystem/epicmorg/edge/jdk6 && pwd && make
+ cd `pwd`/linux/ecosystem/epicmorg/edge/jdk7 && pwd && make
+ cd `pwd`/linux/ecosystem/epicmorg/edge/jdk8 && pwd && make
+ cd `pwd`/linux/ecosystem/epicmorg/edge/jdk11 && pwd && make
+ cd `pwd`/linux/ecosystem/epicmorg/edge/jdk16 && pwd && make
+
+ cd `pwd`/linux/ecosystem/epicmorg/devel/main && pwd && make
+ cd `pwd`/linux/ecosystem/epicmorg/devel/jdk6 && pwd && make
+ cd `pwd`/linux/ecosystem/epicmorg/devel/jdk7 && pwd && make
+ cd `pwd`/linux/ecosystem/epicmorg/devel/jdk8 && pwd && make
+ cd `pwd`/linux/ecosystem/epicmorg/devel/jdk11 && pwd && make
+ cd `pwd`/linux/ecosystem/epicmorg/devel/jdk16 && pwd && make
+
+ cd `pwd`/linux/ecosystem/php/latest && pwd && make
+ cd `pwd`/linux/ecosystem/php/php7.2 && pwd && make
+ cd `pwd`/linux/ecosystem/php/php7.3 && pwd && make
+ cd `pwd`/linux/ecosystem/php/php7.4 && pwd && make
+
+ cd `pwd`/linux/ecosystem/apache2/latest && pwd && make
+ cd `pwd`/linux/ecosystem/apache2/php7.2 && pwd && make
+ cd `pwd`/linux/ecosystem/apache2/php7.3 && pwd && make
+ cd `pwd`/linux/ecosystem/apache2/php7.4 && pwd && make
+
+ cd `pwd`/linux/ecosystem/testrail && pwd && make
+
+ cd `pwd`/linux/ecosystem/torrserver && pwd && make
+
+ cd `pwd`/linux/ecosystem/postgres/latest && pwd && make
+ cd `pwd`/linux/ecosystem/postgres/8.2 && pwd && make
+ cd `pwd`/linux/ecosystem/postgres/8.3 && pwd && make
+ cd `pwd`/linux/ecosystem/postgres/8.4 && pwd && make
+ cd `pwd`/linux/ecosystem/postgres/9.0 && pwd && make
+ cd `pwd`/linux/ecosystem/postgres/9.1 && pwd && make
+ cd `pwd`/linux/ecosystem/postgres/9.2 && pwd && make
+ cd `pwd`/linux/ecosystem/postgres/9.3 && pwd && make
+ cd `pwd`/linux/ecosystem/postgres/9.4 && pwd && make
+ cd `pwd`/linux/ecosystem/postgres/9.5 && pwd && make
+ cd `pwd`/linux/ecosystem/postgres/9.6 && pwd && make
+ cd `pwd`/linux/ecosystem/postgres/10 && pwd && make
+ cd `pwd`/linux/ecosystem/postgres/11 && pwd && make
+ cd `pwd`/linux/ecosystem/postgres/12 && pwd && make
+ cd `pwd`/linux/ecosystem/postgres/13 && pwd && make
+ cd `pwd`/linux/ecosystem/postgres/14 && pwd && make
+
+ cd `pwd`/linux/ecosystem/qbittorrent/latest && pwd && make
+ cd `pwd`/linux/ecosystem/qbittorrent/stable && pwd && make
+
+ cd `pwd`/linux/ecosystem/vk2discord && pwd && make
+
+ cd `pwd`/linux/ecosystem/teamcity/agent/latest && pwd && make
+
+ cd `pwd`/linux/ecosystem/teamcity/agent/amxx-sdk && pwd && make
+ cd `pwd`/linux/ecosystem/teamcity/agent/android-sdk && pwd && make
+ cd `pwd`/linux/ecosystem/teamcity/agent/atlassian-sdk && pwd && make
+ cd `pwd`/linux/ecosystem/teamcity/agent/dotnet-sdk && pwd && make
+ cd `pwd`/linux/ecosystem/teamcity/agent/node12 && pwd && make
+ cd `pwd`/linux/ecosystem/teamcity/agent/node14 && pwd && make
+ cd `pwd`/linux/ecosystem/teamcity/agent/node15 && pwd && make
+ cd `pwd`/linux/ecosystem/teamcity/agent/node16 && pwd && make
+ cd `pwd`/linux/ecosystem/teamcity/agent/php7.2 && pwd && make
+ cd `pwd`/linux/ecosystem/teamcity/agent/php7.3 && pwd && make
+ cd `pwd`/linux/ecosystem/teamcity/agent/php7.4 && pwd && make
+ cd `pwd`/linux/ecosystem/teamcity/agent/steam-sdk && pwd && make
+
+ cd `pwd`/linux/ecosystem/nginx/latest/main && pwd && make
+ cd `pwd`/linux/ecosystem/nginx/latest/php && pwd && make
+ cd `pwd`/linux/ecosystem/nginx/latest/rtmp-hls && pwd && make
+ cd `pwd`/linux/ecosystem/nginx/latest/quic && pwd && make
+
+ cd `pwd`/linux/advanced/vscode-server/latest && pwd && make
+ cd `pwd`/linux/advanced/vscode-server/devops && pwd && make
+
+ cd `pwd`/linux/advanced/vscode-server/amxx && pwd && make
+ cd `pwd`/linux/advanced/vscode-server/android && pwd && make
+ cd `pwd`/linux/advanced/vscode-server/cpp && pwd && make
+ cd `pwd`/linux/advanced/vscode-server/docker && pwd && make
+ cd `pwd`/linux/advanced/vscode-server/dotnet && pwd && make
diff --git a/README.md b/README.md
index 94e942d31..30ef3398b 100644
--- a/README.md
+++ b/README.md
@@ -5,43 +5,31 @@
| [](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Amaster-linux) | [](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Adevelop-linux)
| [](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Amaster-win32) | [](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Adevelop-win32)
+## Description
+A collection of docker images for production use. This repo contains 2 types of images - `advanced` and `ecosystem`. We support `linux x86_64` docker engine (`Win64` is still in the ***testing*** stage).
+
+* `linux/advanced` folder contains improved images like `nextcloud` or `teamcity server`, `zabbix collection`, etc. These images just forked from original developers and patched a bit.
+* `linux/ecosystem` folder contains images developed by our team like full `Atlassian Stack`, compilled `nginx`, `php`, `testrail` and othres.
+
+See more at [DESCRIPTION.md](DESCRIPTION.md)
+
-## Quick navigation for sub-repositories
-Containers was Splited to another sub-repositories. Now current repo will be contain only fresh and latest versions of images. All older versions will be appeared in sub-repos. More fater building, less bad load to CI.
-
-| Bitbucket | Confluence | Jira | EpicMorg |
-|-------------:|-------------:|:-------------|:-------------|
-| [](https://github.com/EpicMorg/docker-scripts/tree/master/atlassian/bitbucket/7) [](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Amaster) | [](https://github.com/EpicMorg/docker-scripts/tree/master/atlassian/confluence/7) [](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Amaster) | [](https://github.com/EpicMorg/docker-scripts/tree/master/atlassian/jira/8) [](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Amaster) | [](https://github.com/EpicMorgVault/docker-deprecated-images) [](https://github.com/EpicMorgVault/docker-deprecated-images) |
-| [](https://github.com/EpicMorg/docker-scripts/tree/master/atlassian/bitbucket/6) [](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Amaster) | [](https://github.com/EpicMorg/docker-scripts/tree/master/atlassian/confluence/6) [](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Amaster) | [](https://github.com/EpicMorg/docker-scripts/tree/master/atlassian/jira/7) [](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Amaster) | [](https://github.com/EpicMorgVault/docker-experimental-images) [](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Atesting) |
-| ` ` | [](https://github.com/EpicMorg/docker-scripts/tree/master/atlassian/confluence/5) [](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Amaster) | [](https://github.com/EpicMorg/docker-scripts/tree/master/atlassian/jira/6) [](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Amaster) | [](https://github.com/EpicMorg/docker-scripts/tree/master/nextcloud) [](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Amaster) |
-| ` ` | ` ` | [](https://github.com/EpicMorg/docker-scripts/tree/master/atlassian/jira/5) [](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Amaster) | [](https://github.com/EpicMorg/docker-scripts/tree/master/postgres) [](https://github.com/EpicMorg/docker-scripts/actions?query=workflow%3Amaster) | |
-
-
-# Containers Map
-
-
-
-# Some popular products [](https://ko-fi.com/B0B81CUI4)
+# Few popular products [](https://ko-fi.com/B0B81CUI4)
| Application | Pulls | Notes
| ------ | ------ | ------
| [](https://www.atlassian.com/software/bitbucket/download) | [](https://hub.docker.com/r/epicmorg/bitbucket/) | `Atlassian Bitbucket` server. You also can install `datacenter` edition.
| [](https://www.atlassian.com/software/confluence/download) | [](https://hub.docker.com/r/epicmorg/confluence/) | `Atlassian Confluence` server. You also can install `datacenter` edition.
| [](https://www.atlassian.com/software/jira/download) | [](https://hub.docker.com/r/epicmorg/jira/) | `Atlassian Jira: Softrware` server. You also can install `servicedesk`, `core` or `datacenter` editions.
-| [](https://nginx.org/en/download.html) | [](https://hub.docker.com/r/epicmorg/balancer/) | Mainline custom build by [EpicMorg Team](https://github.com/EpicMorg) with http2 support and some modules.
-| [](https://deb.sury.org/) | [](https://hub.docker.com/r/epicmorg/websites/ ) | Latest pure apache2.
-| [](https://deb.sury.org/) | [](https://hub.docker.com/r/epicmorg/websites/ ) | php 7.3 custom build by [Ondrej Sury](https://launchpad.net/~ondrej). Component of container above.
-| [](https://hub.docker.com/_/nextcloud) | [](https://hub.docker.com/r/epicmorg/nextcloud/ ) | Fixed `nextcloud:latest` build by [EpicMorg Team](https://github.com/EpicMorg) with benefits.
-| [](https://github.com/zabbix/zabbix-docker) | [](https://hub.docker.com/r/epicmorg/zabbix-agent/ ) | Fixed `zabbix/zabbix-agent:ubuntu-latest` build by [EpicMorg Team](https://github.com/EpicMorg) with benefits.
-| [](https://github.com/zabbix/zabbix-docker) | [](https://hub.docker.com/r/epicmorg/zabbix-server-mysql/ ) | Fixed `zabbix/zabbix-server-mysql:ubuntu-latest` build by [EpicMorg Team](https://github.com/EpicMorg) with benefits.
-| [](https://github.com/zabbix/zabbix-docker) | [](https://hub.docker.com/r/epicmorg/zabbix-web-apache-mysql/ ) | Fixed `zabbix/zabbix-web-apache-mysql:ubuntu-latest` build by [EpicMorg Team](https://github.com/EpicMorg) with benefits.
-| [](https://github.com/zabbix/zabbix-docker) | [](https://hub.docker.com/r/epicmorg/zabbix-java-gateway/ ) | Fixed `zabbix/zabbix-java-gateway:ubuntu-latest` build by [EpicMorg Team](https://github.com/EpicMorg) with benefits.
-| [](https://github.com/JetBrains/teamcity-docker-agent) | [](https://hub.docker.com/r/epicmorg/teamcity-agent/ ) | Custom build by [EpicMorg Team](https://github.com/EpicMorg) with benefits.
-| [](https://github.com/qbittorrent/qBittorrent) | [](https://hub.docker.com/r/epicmorg/qbittorrent/ ) | Custom build by [EpicMorg Team](https://github.com/EpicMorg) with benefits.
+# Stargazers
+[](https://github.com/EpicMorg/docker-scripts/stargazers)
-## Thanks
+# Forkers
+[](https://github.com/EpicMorg/docker-scripts/network/members)
+
+# ↳ Special Thanks:
* [@Aleks-Z](https://github.com/Aleks-Z)
* [@alex4rks](https://github.com/alex4rks)
diff --git a/bin/chmod.sh b/bin/chmod.sh
deleted file mode 100755
index 397510aa9..000000000
--- a/bin/chmod.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-cd ..
-find . -name '*.sh' -type f | xargs chmod +x
-find . -name '*.py' -type f | xargs chmod +x
\ No newline at end of file
diff --git a/bin/docker-compose-update b/bin/docker-compose-update
new file mode 100755
index 000000000..1a43d1c9b
--- /dev/null
+++ b/bin/docker-compose-update
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+export DOCKER_COMPOSE_REMOTE_VERSION=`curl --silent https://api.github.com/repos/docker/compose/releases/latest | jq .name -r`
+
+export DOCKER_COMPOSE_LOCAL_VERSION=`docker-compose -v`
+
+export DOCKER_COMPOSE_BIN=/usr/local/bin/docker-compose
+
+if [ -f $DOCKER_COMPOSE_BIN ]; then
+ echo "========================================================================================"
+ echo "The file '$DOCKER_COMPOSE_BIN' exists."
+ echo "========================================================================================"
+ echo "Local Docker Compose version is: ${DOCKER_COMPOSE_LOCAL_VERSION}"
+ echo "========================================================================================"
+else
+ echo "========================================================================================"
+ echo "The file '$DOCKER_COMPOSE_BIN' in not found. Installing..."
+ echo "========================================================================================"
+fi
+
+echo "========================================================================================"
+echo "Latest Docker Compose version is: ${DOCKER_COMPOSE_REMOTE_VERSION}"
+echo "========================================================================================"
+
+
+echo "========================================================================================"
+echo "Installing remote version:"
+echo "========================================================================================"
+curl -SL https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_REMOTE_VERSION}/docker-compose-Linux-x86_64 -o $DOCKER_COMPOSE_BIN
+
+echo "========================================================================================"
+echo "Setting up permissions..."
+echo "========================================================================================"
+chmod +x $DOCKER_COMPOSE_BIN
+
+
+echo "========================================================================================"
+echo "Updated Docker Compose version is: ${DOCKER_COMPOSE_LOCAL_VERSION}"
+echo "========================================================================================"
diff --git a/bin/docker-compose-update.sh b/bin/docker-compose-update.sh
new file mode 100755
index 000000000..2fc9249f5
--- /dev/null
+++ b/bin/docker-compose-update.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+curl --progress-bar -L "https://github.com/docker/compose/releases/download/`curl -fsSLI -o /dev/null -w %{url_effective} https://github.com/docker/compose/releases/latest | sed 's#.*tag/##g' && echo`/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+chmod +x /usr/local/bin/docker-compose
+docker-compose -v
diff --git a/bin/dotnet/EpicMorg.DockerGenerator.csproj b/bin/dotnet/EpicMorg.DockerGenerator.csproj
new file mode 100644
index 000000000..0bb737852
--- /dev/null
+++ b/bin/dotnet/EpicMorg.DockerGenerator.csproj
@@ -0,0 +1,10 @@
+
+
+
+ Exe
+ net6.0
+
+
+
+
+
diff --git a/bin/dotnet/Program.cs b/bin/dotnet/Program.cs
new file mode 100644
index 000000000..1b28f17e6
--- /dev/null
+++ b/bin/dotnet/Program.cs
@@ -0,0 +1,96 @@
+namespace Epicmorg.DockerGenerator
+{
+ using System;
+ using System.IO;
+ using System.Linq;
+ using System.Runtime.InteropServices;
+ using System.Text.Json;
+ using System.Threading.Tasks;
+
+ class Program
+ {
+ ///
+ /// EpicMorg docker build script generator
+ ///
+ /// Working directory
+ /// Atlassian product JSON
+ /// Product name
+ /// Overwrite existing directories
+ /// Overwrite archive type
+ /// Silently ignore versions without templates
+ ///
+ public static async Task Main(DirectoryInfo workdir, FileInfo json, string product, bool force = false, bool ignoreVersionsWithoutTemplates = false,string archiveType = ".tar.gz")
+ {
+ var jsonData = File.ReadAllText(json.FullName)["downloads(".Length..^1];
+ var items = JsonSerializer.Deserialize(jsonData, new JsonSerializerOptions { PropertyNameCaseInsensitive = true });
+ foreach (var item in items.Where(a=>a.ZipUrl != null && a.ZipUrl.ToString().EndsWith(archiveType) && !a.ZipUrl .ToString().Contains("-war")))
+ {
+ var majorVersion = item.Version.Split(".").First();
+ var templatePath = Path.Combine(workdir.FullName, product, "templates", majorVersion);
+ if (!Directory.Exists(templatePath))
+ {
+ if (!ignoreVersionsWithoutTemplates)
+ {
+ Console.Error.WriteLine("Failed to find template for the major version {0}. Exiting", majorVersion);
+ return;
+ }
+ else
+ {
+ Console.Error.WriteLine("Failed to find template for the major version {0}. Skipping", majorVersion);
+ continue;
+ }
+ }
+
+ var localPath = Path.Combine(product, majorVersion, item.Version);
+ var outputPath = Path.Combine(workdir.FullName, localPath);
+ if (Directory.Exists(outputPath))
+ {
+ if (!force)
+ {
+ Console.Error.WriteLine("Directory '{0}' already exists, skipping", localPath);
+ continue;
+ }
+ else
+ {
+ Console.Error.WriteLine("Directory '{0}' already exists, overwriting", localPath);
+ Directory.Delete(outputPath, true);
+ }
+ }
+ Directory.CreateDirectory(outputPath);
+ CopyFilesRecursively(new DirectoryInfo(templatePath), new DirectoryInfo(outputPath));
+ File.WriteAllText(
+ Path.Combine(outputPath, ".env"),
+ @$"
+RELEASE={item.Version}
+DOWNLOAD_URL={item.ZipUrl}
+"
+ );
+ }
+
+ }
+
+ private static void CopyFilesRecursively(DirectoryInfo source, DirectoryInfo target)
+ {
+ foreach (DirectoryInfo dir in source.GetDirectories())
+ CopyFilesRecursively(dir, target.CreateSubdirectory(dir.Name));
+ foreach (FileInfo file in source.GetFiles())
+ file.CopyTo(Path.Combine(target.FullName, file.Name));
+ }
+
+ public partial class ResponseItem
+ {
+ public string Description { get; set; }
+ public string Edition { get; set; }
+ public Uri ZipUrl { get; set; }
+ public string TarUrl { get; set; }
+ public string Md5 { get; set; }
+ public string Size { get; set; }
+ public string Released { get; set; }
+ public string Type { get; set; }
+ public string Platform { get; set; }
+ public string Version { get; set; }
+ public Uri ReleaseNotes { get; set; }
+ public Uri UpgradeNotes { get; set; }
+ }
+ }
+}
diff --git a/bin/dotnet/README.md b/bin/dotnet/README.md
new file mode 100644
index 000000000..1c5f134a0
--- /dev/null
+++ b/bin/dotnet/README.md
@@ -0,0 +1,14 @@
+## How to Update jira v8 example
+
+```
+Epicmorg.DockerGenerator.exe
+ --workdir "\docker-scripts\linux\atlassian\"
+ --json "\atlassian-json\json-backups\archived\jira-software.json" \\
+ --product "jira"
+ --ignore-versions-without-templates
+```
+
+## inline
+```
+Epicmorg.DockerGenerator.exe --workdir "D:\Work\GitHub\EpicMorg\Main\docker-scripts\linux\atlassian\" --json "D:\Work\GitHub\EpicMorg\Main\atlassian-json\json-backups\archived\jira-software.json" --product "jira" --ignore-versions-without-templates
+```
\ No newline at end of file
diff --git a/linux/mattermost/latest/Dockerfile b/linux/advanced/mattermost/Dockerfile
similarity index 100%
rename from linux/mattermost/latest/Dockerfile
rename to linux/advanced/mattermost/Dockerfile
diff --git a/linux/advanced/mattermost/Makefile b/linux/advanced/mattermost/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/advanced/mattermost/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+ make build
+ make deploy
+ make clean
+
+build:
+ docker-compose build --compress --parallel
+
+deploy:
+ docker-compose push
+
+clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
diff --git a/linux/advanced/mattermost/docker-compose.yml b/linux/advanced/mattermost/docker-compose.yml
new file mode 100644
index 000000000..d778bcbd9
--- /dev/null
+++ b/linux/advanced/mattermost/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+ app:
+ image: "epicmorg/mattermost-enterprise-edition:latest"
+ build:
+ context: .
diff --git a/linux/mattermost/latest/edit.py b/linux/advanced/mattermost/edit.py
similarity index 100%
rename from linux/mattermost/latest/edit.py
rename to linux/advanced/mattermost/edit.py
diff --git a/linux/nextcloud/README.md b/linux/advanced/nextcloud/README.md
similarity index 100%
rename from linux/nextcloud/README.md
rename to linux/advanced/nextcloud/README.md
diff --git a/linux/advanced/nextcloud/patched/14/Dockerfile b/linux/advanced/nextcloud/patched/14/Dockerfile
new file mode 100644
index 000000000..ca2db6e4f
--- /dev/null
+++ b/linux/advanced/nextcloud/patched/14/Dockerfile
@@ -0,0 +1,8 @@
+FROM epicmorg/nextcloud:14
+
+##################################################################
+# thank u, mac users. rolling back normal ZipStreammer
+##################################################################
+RUN rm -frv /usr/src/nextcloud/lib/private/Streamer.php
+ADD Streamer.php /usr/src/nextcloud/lib/private/
+RUN chown nobody:nogroup /usr/src/nextcloud/lib/private/Streamer.php
diff --git a/linux/advanced/nextcloud/patched/14/Makefile b/linux/advanced/nextcloud/patched/14/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/advanced/nextcloud/patched/14/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+ make build
+ make deploy
+ make clean
+
+build:
+ docker-compose build --compress --parallel
+
+deploy:
+ docker-compose push
+
+clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
diff --git a/linux/nextcloud/14/README.md b/linux/advanced/nextcloud/patched/14/README.md
similarity index 100%
rename from linux/nextcloud/14/README.md
rename to linux/advanced/nextcloud/patched/14/README.md
diff --git a/linux/nextcloud/14/Streamer.php b/linux/advanced/nextcloud/patched/14/Streamer.php
similarity index 100%
rename from linux/nextcloud/14/Streamer.php
rename to linux/advanced/nextcloud/patched/14/Streamer.php
diff --git a/linux/advanced/nextcloud/patched/14/docker-compose.yml b/linux/advanced/nextcloud/patched/14/docker-compose.yml
new file mode 100644
index 000000000..4dad29953
--- /dev/null
+++ b/linux/advanced/nextcloud/patched/14/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+ app:
+ image: "epicmorg/nextcloud:14-patched"
+ build:
+ context: .
diff --git a/linux/advanced/nextcloud/patched/15/Dockerfile b/linux/advanced/nextcloud/patched/15/Dockerfile
new file mode 100644
index 000000000..4c8aa5f3c
--- /dev/null
+++ b/linux/advanced/nextcloud/patched/15/Dockerfile
@@ -0,0 +1,8 @@
+FROM epicmorg/nextcloud:15
+
+##################################################################
+# thank u, mac users. rolling back normal ZipStreammer
+##################################################################
+RUN rm -frv /usr/src/nextcloud/lib/private/Streamer.php
+ADD Streamer.php /usr/src/nextcloud/lib/private/
+RUN chown nobody:nogroup /usr/src/nextcloud/lib/private/Streamer.php
diff --git a/linux/advanced/nextcloud/patched/15/Makefile b/linux/advanced/nextcloud/patched/15/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/advanced/nextcloud/patched/15/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+ make build
+ make deploy
+ make clean
+
+build:
+ docker-compose build --compress --parallel
+
+deploy:
+ docker-compose push
+
+clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
diff --git a/linux/nextcloud/15/README.md b/linux/advanced/nextcloud/patched/15/README.md
similarity index 100%
rename from linux/nextcloud/15/README.md
rename to linux/advanced/nextcloud/patched/15/README.md
diff --git a/linux/nextcloud/15/Streamer.php b/linux/advanced/nextcloud/patched/15/Streamer.php
similarity index 100%
rename from linux/nextcloud/15/Streamer.php
rename to linux/advanced/nextcloud/patched/15/Streamer.php
diff --git a/linux/advanced/nextcloud/patched/15/docker-compose.yml b/linux/advanced/nextcloud/patched/15/docker-compose.yml
new file mode 100644
index 000000000..f967eaa50
--- /dev/null
+++ b/linux/advanced/nextcloud/patched/15/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+ app:
+ image: "epicmorg/nextcloud:15-patched"
+ build:
+ context: .
diff --git a/linux/advanced/nextcloud/patched/16/Dockerfile b/linux/advanced/nextcloud/patched/16/Dockerfile
new file mode 100644
index 000000000..c16b7ceb2
--- /dev/null
+++ b/linux/advanced/nextcloud/patched/16/Dockerfile
@@ -0,0 +1,8 @@
+FROM epicmorg/nextcloud:16
+
+##################################################################
+# thank u, mac users. rolling back normal ZipStreammer
+##################################################################
+RUN rm -frv /usr/src/nextcloud/lib/private/Streamer.php
+ADD Streamer.php /usr/src/nextcloud/lib/private/
+RUN chown nobody:nogroup /usr/src/nextcloud/lib/private/Streamer.php
diff --git a/linux/advanced/nextcloud/patched/16/Makefile b/linux/advanced/nextcloud/patched/16/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/advanced/nextcloud/patched/16/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+ make build
+ make deploy
+ make clean
+
+build:
+ docker-compose build --compress --parallel
+
+deploy:
+ docker-compose push
+
+clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
diff --git a/linux/nextcloud/16/README.md b/linux/advanced/nextcloud/patched/16/README.md
similarity index 100%
rename from linux/nextcloud/16/README.md
rename to linux/advanced/nextcloud/patched/16/README.md
diff --git a/linux/nextcloud/16/Streamer.php b/linux/advanced/nextcloud/patched/16/Streamer.php
similarity index 100%
rename from linux/nextcloud/16/Streamer.php
rename to linux/advanced/nextcloud/patched/16/Streamer.php
diff --git a/linux/advanced/nextcloud/patched/16/docker-compose.yml b/linux/advanced/nextcloud/patched/16/docker-compose.yml
new file mode 100644
index 000000000..d32214bcb
--- /dev/null
+++ b/linux/advanced/nextcloud/patched/16/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+ app:
+ image: "epicmorg/nextcloud:16-patched"
+ build:
+ context: .
diff --git a/linux/advanced/nextcloud/patched/17/Dockerfile b/linux/advanced/nextcloud/patched/17/Dockerfile
new file mode 100644
index 000000000..8bce4c202
--- /dev/null
+++ b/linux/advanced/nextcloud/patched/17/Dockerfile
@@ -0,0 +1,8 @@
+FROM epicmorg/nextcloud:17
+
+##################################################################
+# thank u, mac users. rolling back normal ZipStreammer
+##################################################################
+RUN rm -frv /usr/src/nextcloud/lib/private/Streamer.php
+ADD Streamer.php /usr/src/nextcloud/lib/private/
+RUN chown nobody:nogroup /usr/src/nextcloud/lib/private/Streamer.php
diff --git a/linux/advanced/nextcloud/patched/17/Makefile b/linux/advanced/nextcloud/patched/17/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/advanced/nextcloud/patched/17/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+ make build
+ make deploy
+ make clean
+
+build:
+ docker-compose build --compress --parallel
+
+deploy:
+ docker-compose push
+
+clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
diff --git a/linux/nextcloud/17/README.md b/linux/advanced/nextcloud/patched/17/README.md
similarity index 100%
rename from linux/nextcloud/17/README.md
rename to linux/advanced/nextcloud/patched/17/README.md
diff --git a/linux/nextcloud/17/Streamer.php b/linux/advanced/nextcloud/patched/17/Streamer.php
similarity index 100%
rename from linux/nextcloud/17/Streamer.php
rename to linux/advanced/nextcloud/patched/17/Streamer.php
diff --git a/linux/advanced/nextcloud/patched/17/docker-compose.yml b/linux/advanced/nextcloud/patched/17/docker-compose.yml
new file mode 100644
index 000000000..70b24f558
--- /dev/null
+++ b/linux/advanced/nextcloud/patched/17/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+ app:
+ image: "epicmorg/nextcloud:17-patched"
+ build:
+ context: .
diff --git a/linux/advanced/nextcloud/patched/18/Dockerfile b/linux/advanced/nextcloud/patched/18/Dockerfile
new file mode 100644
index 000000000..13e0ba464
--- /dev/null
+++ b/linux/advanced/nextcloud/patched/18/Dockerfile
@@ -0,0 +1,8 @@
+FROM epicmorg/nextcloud:18
+
+##################################################################
+# thank u, mac users. rolling back normal ZipStreammer
+##################################################################
+RUN rm -frv /usr/src/nextcloud/lib/private/Streamer.php
+ADD Streamer.php /usr/src/nextcloud/lib/private/
+RUN chown nobody:nogroup /usr/src/nextcloud/lib/private/Streamer.php
diff --git a/linux/advanced/nextcloud/patched/18/Makefile b/linux/advanced/nextcloud/patched/18/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/advanced/nextcloud/patched/18/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+ make build
+ make deploy
+ make clean
+
+build:
+ docker-compose build --compress --parallel
+
+deploy:
+ docker-compose push
+
+clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
diff --git a/linux/nextcloud/18/README.md b/linux/advanced/nextcloud/patched/18/README.md
similarity index 100%
rename from linux/nextcloud/18/README.md
rename to linux/advanced/nextcloud/patched/18/README.md
diff --git a/linux/nextcloud/18/Streamer.php b/linux/advanced/nextcloud/patched/18/Streamer.php
similarity index 100%
rename from linux/nextcloud/18/Streamer.php
rename to linux/advanced/nextcloud/patched/18/Streamer.php
diff --git a/linux/advanced/nextcloud/patched/18/docker-compose.yml b/linux/advanced/nextcloud/patched/18/docker-compose.yml
new file mode 100644
index 000000000..0302ada0d
--- /dev/null
+++ b/linux/advanced/nextcloud/patched/18/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+ app:
+ image: "epicmorg/nextcloud:18-patched"
+ build:
+ context: .
diff --git a/linux/advanced/nextcloud/patched/19/Dockerfile b/linux/advanced/nextcloud/patched/19/Dockerfile
new file mode 100644
index 000000000..57643bc83
--- /dev/null
+++ b/linux/advanced/nextcloud/patched/19/Dockerfile
@@ -0,0 +1,8 @@
+FROM epicmorg/nextcloud:19
+
+##################################################################
+# thank u, mac users. rolling back normal ZipStreammer
+##################################################################
+RUN rm -frv /usr/src/nextcloud/lib/private/Streamer.php
+ADD Streamer.php /usr/src/nextcloud/lib/private/
+RUN chown nobody:nogroup /usr/src/nextcloud/lib/private/Streamer.php
diff --git a/linux/advanced/nextcloud/patched/19/Makefile b/linux/advanced/nextcloud/patched/19/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/advanced/nextcloud/patched/19/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+ make build
+ make deploy
+ make clean
+
+build:
+ docker-compose build --compress --parallel
+
+deploy:
+ docker-compose push
+
+clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
diff --git a/linux/nextcloud/19/README.md b/linux/advanced/nextcloud/patched/19/README.md
similarity index 100%
rename from linux/nextcloud/19/README.md
rename to linux/advanced/nextcloud/patched/19/README.md
diff --git a/linux/nextcloud/19/Streamer.php b/linux/advanced/nextcloud/patched/19/Streamer.php
similarity index 100%
rename from linux/nextcloud/19/Streamer.php
rename to linux/advanced/nextcloud/patched/19/Streamer.php
diff --git a/linux/advanced/nextcloud/patched/19/docker-compose.yml b/linux/advanced/nextcloud/patched/19/docker-compose.yml
new file mode 100644
index 000000000..14b4a0dae
--- /dev/null
+++ b/linux/advanced/nextcloud/patched/19/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+ app:
+ image: "epicmorg/nextcloud:19-patched"
+ build:
+ context: .
diff --git a/linux/advanced/nextcloud/patched/20/Dockerfile b/linux/advanced/nextcloud/patched/20/Dockerfile
new file mode 100644
index 000000000..c14a32c56
--- /dev/null
+++ b/linux/advanced/nextcloud/patched/20/Dockerfile
@@ -0,0 +1,8 @@
+FROM epicmorg/nextcloud:20
+
+##################################################################
+# thank u, mac users. rolling back normal ZipStreammer
+##################################################################
+RUN rm -frv /usr/src/nextcloud/lib/private/Streamer.php
+ADD Streamer.php /usr/src/nextcloud/lib/private/
+RUN chown nobody:nogroup /usr/src/nextcloud/lib/private/Streamer.php
diff --git a/linux/advanced/nextcloud/patched/20/Makefile b/linux/advanced/nextcloud/patched/20/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/advanced/nextcloud/patched/20/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+ make build
+ make deploy
+ make clean
+
+build:
+ docker-compose build --compress --parallel
+
+deploy:
+ docker-compose push
+
+clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
diff --git a/linux/nextcloud/20/README.md b/linux/advanced/nextcloud/patched/20/README.md
similarity index 100%
rename from linux/nextcloud/20/README.md
rename to linux/advanced/nextcloud/patched/20/README.md
diff --git a/linux/nextcloud/20/Streamer.php b/linux/advanced/nextcloud/patched/20/Streamer.php
similarity index 100%
rename from linux/nextcloud/20/Streamer.php
rename to linux/advanced/nextcloud/patched/20/Streamer.php
diff --git a/linux/advanced/nextcloud/patched/20/docker-compose.yml b/linux/advanced/nextcloud/patched/20/docker-compose.yml
new file mode 100644
index 000000000..cf59d2964
--- /dev/null
+++ b/linux/advanced/nextcloud/patched/20/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+ app:
+ image: "epicmorg/nextcloud:20-patched"
+ build:
+ context: .
diff --git a/linux/advanced/nextcloud/patched/21/Dockerfile b/linux/advanced/nextcloud/patched/21/Dockerfile
new file mode 100644
index 000000000..d00bd4a77
--- /dev/null
+++ b/linux/advanced/nextcloud/patched/21/Dockerfile
@@ -0,0 +1,8 @@
+FROM epicmorg/nextcloud:21
+
+##################################################################
+# thank u, mac users. rolling back normal ZipStreammer
+##################################################################
+RUN rm -frv /usr/src/nextcloud/lib/private/Streamer.php
+ADD Streamer.php /usr/src/nextcloud/lib/private/
+RUN chown nobody:nogroup /usr/src/nextcloud/lib/private/Streamer.php
diff --git a/linux/advanced/nextcloud/patched/21/Makefile b/linux/advanced/nextcloud/patched/21/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/advanced/nextcloud/patched/21/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+ make build
+ make deploy
+ make clean
+
+build:
+ docker-compose build --compress --parallel
+
+deploy:
+ docker-compose push
+
+clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
diff --git a/linux/nextcloud/21/README.md b/linux/advanced/nextcloud/patched/21/README.md
similarity index 100%
rename from linux/nextcloud/21/README.md
rename to linux/advanced/nextcloud/patched/21/README.md
diff --git a/linux/nextcloud/21/Streamer.php b/linux/advanced/nextcloud/patched/21/Streamer.php
similarity index 100%
rename from linux/nextcloud/21/Streamer.php
rename to linux/advanced/nextcloud/patched/21/Streamer.php
diff --git a/linux/advanced/nextcloud/patched/21/docker-compose.yml b/linux/advanced/nextcloud/patched/21/docker-compose.yml
new file mode 100644
index 000000000..38e45a129
--- /dev/null
+++ b/linux/advanced/nextcloud/patched/21/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+ app:
+ image: "epicmorg/nextcloud:21-patched"
+ build:
+ context: .
diff --git a/linux/advanced/nextcloud/patched/22/Dockerfile b/linux/advanced/nextcloud/patched/22/Dockerfile
new file mode 100644
index 000000000..a3e26aa8d
--- /dev/null
+++ b/linux/advanced/nextcloud/patched/22/Dockerfile
@@ -0,0 +1,8 @@
+FROM epicmorg/nextcloud:22
+
+##################################################################
+# thank u, mac users. rolling back normal ZipStreammer
+##################################################################
+RUN rm -frv /usr/src/nextcloud/lib/private/Streamer.php
+ADD Streamer.php /usr/src/nextcloud/lib/private/
+RUN chown nobody:nogroup /usr/src/nextcloud/lib/private/Streamer.php
diff --git a/linux/advanced/nextcloud/patched/22/Makefile b/linux/advanced/nextcloud/patched/22/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/advanced/nextcloud/patched/22/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+ make build
+ make deploy
+ make clean
+
+build:
+ docker-compose build --compress --parallel
+
+deploy:
+ docker-compose push
+
+clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
diff --git a/linux/nextcloud/latest/README.md b/linux/advanced/nextcloud/patched/22/README.md
similarity index 100%
rename from linux/nextcloud/latest/README.md
rename to linux/advanced/nextcloud/patched/22/README.md
diff --git a/linux/nextcloud/latest/Streamer.php b/linux/advanced/nextcloud/patched/22/Streamer.php
similarity index 100%
rename from linux/nextcloud/latest/Streamer.php
rename to linux/advanced/nextcloud/patched/22/Streamer.php
diff --git a/linux/advanced/nextcloud/patched/22/docker-compose.yml b/linux/advanced/nextcloud/patched/22/docker-compose.yml
new file mode 100644
index 000000000..2d2e02014
--- /dev/null
+++ b/linux/advanced/nextcloud/patched/22/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+ app:
+ image: "epicmorg/nextcloud:22-patched"
+ build:
+ context: .
diff --git a/linux/advanced/nextcloud/patched/latest/Dockerfile b/linux/advanced/nextcloud/patched/latest/Dockerfile
new file mode 100644
index 000000000..365e01819
--- /dev/null
+++ b/linux/advanced/nextcloud/patched/latest/Dockerfile
@@ -0,0 +1,8 @@
+FROM epicmorg/nextcloud:latest
+
+##################################################################
+# thank u, mac users. rolling back normal ZipStreammer
+##################################################################
+RUN rm -frv /usr/src/nextcloud/lib/private/Streamer.php
+ADD Streamer.php /usr/src/nextcloud/lib/private/
+RUN chown nobody:nogroup /usr/src/nextcloud/lib/private/Streamer.php
diff --git a/linux/advanced/nextcloud/patched/latest/Makefile b/linux/advanced/nextcloud/patched/latest/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/advanced/nextcloud/patched/latest/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+ make build
+ make deploy
+ make clean
+
+build:
+ docker-compose build --compress --parallel
+
+deploy:
+ docker-compose push
+
+clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
diff --git a/linux/advanced/nextcloud/patched/latest/README.md b/linux/advanced/nextcloud/patched/latest/README.md
new file mode 100644
index 000000000..b6df71808
--- /dev/null
+++ b/linux/advanced/nextcloud/patched/latest/README.md
@@ -0,0 +1,527 @@
+# What is Nextcloud?
+
+[](https://github.com/nextcloud/docker/actions?query=workflow%3AImages)
+[](https://github.com/nextcloud/docker/actions?query=workflow%3Aupdate.sh)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/i386/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/mips64le/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/s390x/job/nextcloud)
+
+A safe home for all your data. Access & share your files, calendars, contacts, mail & more from any device, on your terms.
+
+
+
+# How to use this image
+This image is designed to be used in a micro-service environment. There are two versions of the image you can choose from.
+
+The `apache` tag contains a full Nextcloud installation including an apache web server. It is designed to be easy to use and gets you running pretty fast. This is also the default for the `latest` tag and version tags that are not further specified.
+
+The second option is a `fpm` container. It is based on the [php-fpm](https://hub.docker.com/_/php/) image and runs a fastCGI-Process that serves your Nextcloud page. To use this image it must be combined with any webserver that can proxy the http requests to the FastCGI-port of the container.
+
+[](http://play-with-docker.com?stack=https://raw.githubusercontent.com/nextcloud/docker/8db861d67f257a3e9ac1790ea06d4e2a7a193a6c/stack.yml)
+
+## Using the apache image
+The apache image contains a webserver and exposes port 80. To start the container type:
+
+```console
+$ docker run -d -p 8080:80 nextcloud
+```
+
+Now you can access Nextcloud at http://localhost:8080/ from your host system.
+
+
+## Using the fpm image
+To use the fpm image, you need an additional web server that can proxy http-request to the fpm-port of the container. For fpm connection this container exposes port 9000. In most cases, you might want use another container or your host as proxy.
+If you use your host you can address your Nextcloud container directly on port 9000. If you use another container, make sure that you add them to the same docker network (via `docker run --network ...` or a `docker-compose` file).
+In both cases you don't want to map the fpm port to your host.
+
+```console
+$ docker run -d nextcloud:fpm
+```
+
+As the fastCGI-Process is not capable of serving static files (style sheets, images, ...), the webserver needs access to these files. This can be achieved with the `volumes-from` option. You can find more information in the [docker-compose section](#running-this-image-with-docker-compose).
+
+## Using an external database
+By default, this container uses SQLite for data storage but the Nextcloud setup wizard (appears on first run) allows connecting to an existing MySQL/MariaDB or PostgreSQL database. You can also link a database container, e. g. `--link my-mysql:mysql`, and then use `mysql` as the database host on setup. More info is in the docker-compose section.
+
+## Persistent data
+The Nextcloud installation and all data beyond what lives in the database (file uploads, etc) are stored in the [unnamed docker volume](https://docs.docker.com/engine/tutorials/dockervolumes/#adding-a-data-volume) volume `/var/www/html`. The docker daemon will store that data within the docker directory `/var/lib/docker/volumes/...`. That means your data is saved even if the container crashes, is stopped or deleted.
+
+A named Docker volume or a mounted host directory should be used for upgrades and backups. To achieve this, you need one volume for your database container and one for Nextcloud.
+
+Nextcloud:
+- `/var/www/html/` folder where all nextcloud data lives
+```console
+$ docker run -d \
+-v nextcloud:/var/www/html \
+nextcloud
+```
+
+Database:
+- `/var/lib/mysql` MySQL / MariaDB Data
+- `/var/lib/postgresql/data` PostgreSQL Data
+```console
+$ docker run -d \
+-v db:/var/lib/mysql \
+mariadb
+```
+
+If you want to get fine grained access to your individual files, you can mount additional volumes for data, config, your theme and custom apps.
+The `data`, `config` files are stored in respective subfolders inside `/var/www/html/`. The apps are split into core `apps` (which are shipped with Nextcloud and you don't need to take care of) and a `custom_apps` folder. If you use a custom theme it would go into the `themes` subfolder.
+
+Overview of the folders that can be mounted as volumes:
+
+- `/var/www/html` Main folder, needed for updating
+- `/var/www/html/custom_apps` installed / modified apps
+- `/var/www/html/config` local configuration
+- `/var/www/html/data` the actual data of your Nextcloud
+- `/var/www/html/themes/` theming/branding
+
+If you want to use named volumes for all of these, it would look like this:
+```console
+$ docker run -d \
+-v nextcloud:/var/www/html \
+-v apps:/var/www/html/custom_apps \
+-v config:/var/www/html/config \
+-v data:/var/www/html/data \
+-v theme:/var/www/html/themes/ \
+nextcloud
+```
+
+## Using the Nextcloud command-line interface
+To use the [Nextcloud command-line interface](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/occ_command.html) (aka. `occ` command):
+```console
+$ docker exec --user www-data CONTAINER_ID php occ
+```
+or for docker-compose:
+```console
+$ docker-compose exec --user www-data app php occ
+```
+
+## Auto configuration via environment variables
+The nextcloud image supports auto configuration via environment variables. You can preconfigure everything that is asked on the install page on first run. To enable auto configuration, set your database connection via the following environment variables. ONLY use one database type!
+
+__SQLite__:
+- `SQLITE_DATABASE` Name of the database using sqlite
+
+__MYSQL/MariaDB__:
+- `MYSQL_DATABASE` Name of the database using mysql / mariadb.
+- `MYSQL_USER` Username for the database using mysql / mariadb.
+- `MYSQL_PASSWORD` Password for the database user using mysql / mariadb.
+- `MYSQL_HOST` Hostname of the database server using mysql / mariadb.
+
+__PostgreSQL__:
+- `POSTGRES_DB` Name of the database using postgres.
+- `POSTGRES_USER` Username for the database using postgres.
+- `POSTGRES_PASSWORD` Password for the database user using postgres.
+- `POSTGRES_HOST` Hostname of the database server using postgres.
+
+If you set any values, they will not be asked in the install page on first run. With a complete configuration by using all variables for your database type, you can additionally configure your Nextcloud instance by setting admin user and password (only works if you set both):
+
+- `NEXTCLOUD_ADMIN_USER` Name of the Nextcloud admin user.
+- `NEXTCLOUD_ADMIN_PASSWORD` Password for the Nextcloud admin user.
+
+If you want, you can set the data directory, otherwise default value will be used.
+
+- `NEXTCLOUD_DATA_DIR` (default: _/var/www/html/data_) Configures the data directory where nextcloud stores all files from the users.
+
+One or more trusted domains can be set through environment variable, too. They will be added to the configuration after install.
+
+- `NEXTCLOUD_TRUSTED_DOMAINS` (not set by default) Optional space-separated list of domains
+
+The install and update script is only triggered when a default command is used (`apache-foreground` or `php-fpm`). If you use a custom command you have to enable the install / update with
+
+- `NEXTCLOUD_UPDATE` (default: _0_)
+
+If you want to use Redis you have to create a separate [Redis](https://hub.docker.com/_/redis/) container in your setup / in your docker-compose file. To inform Nextcloud about the Redis container, pass in the following parameters:
+
+- `REDIS_HOST` (not set by default) Name of Redis container
+- `REDIS_HOST_PORT` (default: _6379_) Optional port for Redis, only use for external Redis servers that run on non-standard ports.
+- `REDIS_HOST_PASSWORD` (not set by default) Redis password
+
+The use of Redis is recommended to prevent file locking problems. See the examples for further instructions.
+
+To use an external SMTP server, you have to provide the connection details. To configure Nextcloud to use SMTP add:
+
+- `SMTP_HOST` (not set by default): The hostname of the SMTP server.
+- `SMTP_SECURE` (empty by default): Set to `ssl` to use SSL, or `tls` to use STARTTLS.
+- `SMTP_PORT` (default: `465` for SSL and `25` for non-secure connections): Optional port for the SMTP connection. Use `587` for an alternative port for STARTTLS.
+- `SMTP_AUTHTYPE` (default: `LOGIN`): The method used for authentication. Use `PLAIN` if no authentication is required.
+- `SMTP_NAME` (empty by default): The username for the authentication.
+- `SMTP_PASSWORD` (empty by default): The password for the authentication.
+- `MAIL_FROM_ADDRESS` (not set by default): Use this address for the 'from' field in the emails sent by Nextcloud.
+- `MAIL_DOMAIN` (not set by default): Set a different domain for the emails than the domain where Nextcloud is installed.
+
+Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/email_configuration.html) for other values to configure SMTP.
+
+To use an external S3 compatible object store as primary storage, set the following variables:
+- `OBJECTSTORE_S3_HOST`: The hostname of the object storage server
+- `OBJECTSTORE_S3_BUCKET`: The name of the bucket that Nextcloud should store the data in
+- `OBJECTSTORE_S3_KEY`: AWS style access key
+- `OBJECTSTORE_S3_SECRET`: AWS style secret access key
+- `OBJECTSTORE_S3_PORT`: The port that the object storage server is being served over
+- `OBJECTSTORE_S3_SSL` (default: `true`): Whether or not SSL/TLS should be used to communicate with object storage server
+- `OBJECTSTORE_S3_REGION`: The region that the S3 bucket resides in.
+- `OBJECTSTORE_S3_USEPATH_STYLE` (default: `false`): Not required for AWS S3
+
+Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/primary_storage.html#simple-storage-service-s3) for more information.
+
+To use an external OpenStack Swift object store as primary storage, set the following variables:
+- `OBJECTSTORE_SWIFT_URL`: The Swift identity (Keystone) endpoint
+- `OBJECTSTORE_SWIFT_AUTOCREATE` (default: `false`): Whether or not Nextcloud should automatically create the Swift container
+- `OBJECTSTORE_SWIFT_USER_NAME`: Swift username
+- `OBJECTSTORE_SWIFT_USER_PASSWORD`: Swift user password
+- `OBJECTSTORE_SWIFT_USER_DOMAIN` (default: `Default`): Swift user domain
+- `OBJECTSTORE_SWIFT_PROJECT_NAME`: OpenStack project name
+- `OBJECTSTORE_SWIFT_PROJECT_DOMAIN` (default: `Default`): OpenStack project domain
+- `OBJECTSTORE_SWIFT_SERVICE_NAME` (default: `swift`): Swift service name
+- `OBJECTSTORE_SWIFT_SERVICE_REGION`: Swift endpoint region
+- `OBJECTSTORE_SWIFT_CONTAINER_NAME`: Swift container (bucket) that Nextcloud should store the data in
+
+Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/primary_storage.html#openstack-swift) for more information.
+
+
+## Using the apache image behind a reverse proxy and auto configure server host and protocol
+
+The apache image will replace the remote addr (ip address visible to Nextcloud) with the ip address from `X-Real-IP` if the request is coming from a proxy in 10.0.0.0/8, 172.16.0.0/12 or 192.168.0.0/16 by default. If you want Nextcloud to pick up the server host (`HTTP_X_FORWARDED_HOST`), protocol (`HTTP_X_FORWARDED_PROTO`) and client ip (`HTTP_X_FORWARDED_FOR`) from a trusted proxy disable rewrite ip and the reverse proxies ip address to `TRUSTED_PROXIES`.
+
+- `APACHE_DISABLE_REWRITE_IP` (not set by default): Set to 1 to disable rewrite ip.
+
+- `TRUSTED_PROXIES` (empty by default): A space-separated list of trusted proxies. CIDR notation is supported for IPv4.
+
+If the `TRUSTED_PROXIES` approach does not work for you, try using fixed values for overwrite parameters.
+
+- `OVERWRITEHOST` (empty by default): Set the hostname of the proxy. Can also specify a port.
+- `OVERWRITEPROTOCOL` (empty by default): Set the protocol of the proxy, http or https.
+- `OVERWRITEWEBROOT` (empty by default): Set the absolute path of the proxy.
+- `OVERWRITECONDADDR` (empty by default): Regex to overwrite the values dependent on the remote address.
+
+Check the [Nexcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/reverse_proxy_configuration.html) for more details.
+
+Keep in mind that once set, removing these environment variables won't remove these values from the configuration file, due to how Nextcloud merges configuration files together.
+
+# Running this image with docker-compose
+The easiest way to get a fully featured and functional setup is using a `docker-compose` file. There are too many different possibilities to setup your system, so here are only some examples of what you have to look for.
+
+At first, make sure you have chosen the right base image (fpm or apache) and added features you wanted (see below). In every case, you would want to add a database container and docker volumes to get easy access to your persistent data. When you want to have your server reachable from the internet, adding HTTPS-encryption is mandatory! See below for more information.
+
+## Base version - apache
+This version will use the apache image and add a mariaDB container. The volumes are set to keep your data persistent. This setup provides **no ssl encryption** and is intended to run behind a proxy.
+
+Make sure to pass in values for `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` variables before you run this setup.
+
+```yaml
+version: '2'
+
+volumes:
+ nextcloud:
+ db:
+
+services:
+ db:
+ image: mariadb
+ command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+ restart: always
+ volumes:
+ - db:/var/lib/mysql
+ environment:
+ - MYSQL_ROOT_PASSWORD=
+ - MYSQL_PASSWORD=
+ - MYSQL_DATABASE=nextcloud
+ - MYSQL_USER=nextcloud
+
+ app:
+ image: nextcloud
+ ports:
+ - 8080:80
+ links:
+ - db
+ volumes:
+ - nextcloud:/var/www/html
+ restart: always
+
+```
+
+Then run `docker-compose up -d`, now you can access Nextcloud at http://localhost:8080/ from your host system.
+
+## Base version - FPM
+When using the FPM image, you need another container that acts as web server on port 80 and proxies the requests to the Nextcloud container. In this example a simple nginx container is combined with the Nextcloud-fpm image and a MariaDB database container. The data is stored in docker volumes. The nginx container also needs access to static files from your Nextcloud installation. It gets access to all the volumes mounted to Nextcloud via the `volumes_from` option.The configuration for nginx is stored in the configuration file `nginx.conf`, that is mounted into the container. An example can be found in the examples section [here](https://github.com/nextcloud/docker/tree/master/.examples).
+
+As this setup does **not include encryption**, it should be run behind a proxy.
+
+Make sure to pass in values for `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` variables before you run this setup.
+
+```yaml
+version: '2'
+
+volumes:
+ nextcloud:
+ db:
+
+services:
+ db:
+ image: mariadb
+ command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+ restart: always
+ volumes:
+ - db:/var/lib/mysql
+ environment:
+ - MYSQL_ROOT_PASSWORD=
+ - MYSQL_PASSWORD=
+ - MYSQL_DATABASE=nextcloud
+ - MYSQL_USER=nextcloud
+
+ app:
+ image: nextcloud:fpm
+ links:
+ - db
+ volumes:
+ - nextcloud:/var/www/html
+ restart: always
+
+ web:
+ image: nginx
+ ports:
+ - 8080:80
+ links:
+ - app
+ volumes:
+ - ./nginx.conf:/etc/nginx/nginx.conf:ro
+ volumes_from:
+ - app
+ restart: always
+```
+
+Then run `docker-compose up -d`, now you can access Nextcloud at http://localhost:8080/ from your host system.
+
+# Docker Secrets
+As an alternative to passing sensitive information via environment variables, _FILE may be appended to the previously listed environment variables, causing the initialization script to load the values for those variables from files present in the container. In particular, this can be used to load passwords from Docker secrets stored in /run/secrets/ files. For example:
+```yaml
+version: '3.2'
+
+services:
+ db:
+ image: postgres
+ restart: always
+ volumes:
+ - db:/var/lib/postgresql/data
+ environment:
+ - POSTGRES_DB_FILE=/run/secrets/postgres_db
+ - POSTGRES_USER_FILE=/run/secrets/postgres_user
+ - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
+ secrets:
+ - postgres_db
+ - postgres_password
+ - postgres_user
+
+ app:
+ image: nextcloud
+ restart: always
+ ports:
+ - 8080:80
+ volumes:
+ - nextcloud:/var/www/html
+ environment:
+ - POSTGRES_HOST=db
+ - POSTGRES_DB_FILE=/run/secrets/postgres_db
+ - POSTGRES_USER_FILE=/run/secrets/postgres_user
+ - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
+ - NEXTCLOUD_ADMIN_PASSWORD_FILE=/run/secrets/nextcloud_admin_password
+ - NEXTCLOUD_ADMIN_USER_FILE=/run/secrets/nextcloud_admin_user
+ depends_on:
+ - db
+ secrets:
+ - nextcloud_admin_password
+ - nextcloud_admin_user
+ - postgres_db
+ - postgres_password
+ - postgres_user
+
+volumes:
+ db:
+ nextcloud:
+
+secrets:
+ nextcloud_admin_password:
+ file: ./nextcloud_admin_password.txt # put admin password to this file
+ nextcloud_admin_user:
+ file: ./nextcloud_admin_user.txt # put admin username to this file
+ postgres_db:
+ file: ./postgres_db.txt # put postgresql db name to this file
+ postgres_password:
+ file: ./postgres_password.txt # put postgresql password to this file
+ postgres_user:
+ file: ./postgres_user.txt # put postgresql username to this file
+```
+
+Currently, this is only supported for `NEXTCLOUD_ADMIN_PASSWORD`, `NEXTCLOUD_ADMIN_USER`, `MYSQL_DB`, `MYSQL_PASSWORD`, `MYSQL_USER`, `POSTGRES_DB`, `POSTGRES_PASSWORD`, `POSTGRES_USER`.
+
+# Make your Nextcloud available from the internet
+Until here, your Nextcloud is just available from you docker host. If you want your Nextcloud available from the internet adding SSL encryption is mandatory.
+
+## HTTPS - SSL encryption
+There are many different possibilities to introduce encryption depending on your setup.
+
+We recommend using a reverse proxy in front of our Nextcloud installation. Your Nextcloud will only be reachable through the proxy, which encrypts all traffic to the clients. You can mount your manually generated certificates to the proxy or use a fully automated solution which generates and renews the certificates for you.
+
+In our [examples](https://github.com/nextcloud/docker/tree/master/.examples) section we have an example for a fully automated setup using a reverse proxy, a container for [Let's Encrypt](https://letsencrypt.org/) certificate handling, database and Nextcloud. It uses the popular [nginx-proxy](https://github.com/jwilder/nginx-proxy) and [docker-letsencrypt-nginx-proxy-companion](https://github.com/JrCs/docker-letsencrypt-nginx-proxy-companion) containers. Please check the according documentations before using this setup.
+
+# First use
+When you first access your Nextcloud, the setup wizard will appear and ask you to choose an administrator account username, password and the database connection. For the database use `db` as host and `nextcloud` as table and user name. Also enter the password you chose in your `docker-compose.yml` file.
+
+# Update to a newer version
+Updating the Nextcloud container is done by pulling the new image, throwing away the old container and starting the new one.
+
+**It is only possible to upgrade one major version at a time. For example, if you want to upgrade from version 14 to 16, you will have to upgrade from version 14 to 15, then from 15 to 16.**
+
+Since all data is stored in volumes, nothing gets lost. The startup script will check for the version in your volume and the installed docker version. If it finds a mismatch, it automatically starts the upgrade process. Don't forget to add all the volumes to your new container, so it works as expected.
+
+```console
+$ docker pull nextcloud
+$ docker stop
+$ docker rm
+$ docker run -d nextcloud
+```
+Beware that you have to run the same command with the options that you used to initially start your Nextcloud. That includes volumes, port mapping.
+
+When using docker-compose your compose file takes care of your configuration, so you just have to run:
+
+```console
+$ docker-compose pull
+$ docker-compose up -d
+```
+
+
+# Adding Features
+A lot of people want to use additional functionality inside their Nextcloud installation. If the image does not include the packages you need, you can easily build your own image on top of it.
+Start your derived image with the `FROM` statement and add whatever you like.
+
+```yaml
+FROM nextcloud:apache
+
+RUN ...
+
+```
+The [examples folder](https://github.com/nextcloud/docker/blob/master/.examples) gives a few examples on how to add certain functionalities, like including the cron job, smb-support or imap-authentication.
+
+If you use your own Dockerfile, you need to configure your docker-compose file accordingly. Switch out the `image` option with `build`. You have to specify the path to your Dockerfile. (in the example it's in the same directory next to the docker-compose file)
+
+```yaml
+ app:
+ build: .
+ links:
+ - db
+ volumes:
+ - data:/var/www/html/data
+ - config:/var/www/html/config
+ - apps:/var/www/html/apps
+ restart: always
+```
+
+If you intend to use another command to run the image, make sure that you set `NEXTCLOUD_UPDATE=1` in your Dockerfile. Otherwise the installation and update will not work.
+
+```yaml
+FROM nextcloud:apache
+
+...
+
+ENV NEXTCLOUD_UPDATE=1
+
+CMD ["/usr/bin/supervisord"]
+```
+
+
+**Updating** your own derived image is also very simple. When a new version of the Nextcloud image is available run:
+
+```console
+docker build -t your-name --pull .
+docker run -d your-name
+```
+
+or for docker-compose:
+```console
+docker-compose build --pull
+docker-compose up -d
+```
+
+The `--pull` option tells docker to look for new versions of the base image. Then the build instructions inside your `Dockerfile` are run on top of the new image.
+
+# Migrating an existing installation
+You're already using Nextcloud and want to switch to docker? Great! Here are some things to look out for:
+
+1. Define your whole Nextcloud infrastructure in a `docker-compose` file and run it with `docker-compose up -d` to get the base installation, volumes and database. Work from there.
+2. Restore your database from a mysqldump (nextcloud\_db\_1 is the name of your db container)
+ - To import from a MySQL dump use the following commands
+ ```console
+ docker cp ./database.dmp nextcloud_db_1:/dmp
+ docker-compose exec db sh -c "mysql -u USER -pPASSWORD nextcloud < /dmp"
+ docker-compose exec db rm /dmp
+ ```
+ - To import from a PostgreSQL dump use to following commands
+ ```console
+ docker cp ./database.dmp nextcloud_db_1:/dmp
+ docker-compose exec db sh -c "psql -U USER --set ON_ERROR_STOP=on nextcloud < /dmp"
+ docker-compose exec db rm /dmp
+ ```
+3. Edit your config.php
+ 1. Set database connection
+ - In case of MySQL database
+ ```php
+ 'dbhost' => 'db:3306',
+ ```
+ - In case of PostgreSQL database
+ ```php
+ 'dbhost' => 'db:5432',
+ ```
+ 2. Make sure you have no configuration for the `apps_paths`. Delete lines like these
+ ```diff
+ - "apps_paths" => array (
+ - 0 => array (
+ - "path" => OC::$SERVERROOT."/apps",
+ - "url" => "/apps",
+ - "writable" => true,
+ - ),
+ ```
+ 3. Make sure to have the `apps` directory non writable and the `custom_apps` directory writable
+ ```php
+ 'apps_paths' => array (
+ 0 => array (
+ 'path' => '/var/www/html/apps',
+ 'url' => '/apps',
+ 'writable' => false,
+ ),
+ 1 => array (
+ 'path' => '/var/www/html/custom_apps',
+ 'url' => '/custom_apps',
+ 'writable' => true,
+ ),
+ ),
+ ```
+ 4. Make sure your data directory is set to /var/www/html/data
+ ```php
+ 'datadirectory' => '/var/www/html/data',
+ ```
+
+
+4. Copy your data (nextcloud_app_1 is the name of your Nextcloud container):
+```console
+docker cp ./data/ nextcloud_app_1:/var/www/html/
+docker-compose exec app chown -R www-data:www-data /var/www/html/data
+docker cp ./theming/ nextcloud_app_1:/var/www/html/
+docker-compose exec app chown -R www-data:www-data /var/www/html/theming
+docker cp ./config/config.php nextcloud_app_1:/var/www/html/config
+docker-compose exec app chown -R www-data:www-data /var/www/html/config
+```
+5. Copy only the custom apps you use (or simply redownload them from the web interface):
+```console
+docker cp ./custom_apps/ nextcloud_data:/var/www/html/
+docker-compose exec app chown -R www-data:www-data /var/www/html/custom_apps
+```
+
+# Questions / Issues
+If you got any questions or problems using the image, please visit our [Github Repository](https://github.com/nextcloud/docker) and write an issue.
diff --git a/linux/advanced/nextcloud/patched/latest/Streamer.php b/linux/advanced/nextcloud/patched/latest/Streamer.php
new file mode 100644
index 000000000..02a7719e4
--- /dev/null
+++ b/linux/advanced/nextcloud/patched/latest/Streamer.php
@@ -0,0 +1,190 @@
+
+ * @author Daniel Calviño Sánchez
+ * @author Joas Schilling
+ * @author Roeland Jago Douma
+ * @author Thomas Müller
+ * @author Victor Dubiniuk
+ *
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program. If not, see
+ *
+ */
+
+namespace OC;
+
+use OC\Files\Filesystem;
+use OCP\Files\File;
+use OCP\Files\Folder;
+use OCP\Files\InvalidPathException;
+use OCP\Files\NotFoundException;
+use OCP\Files\NotPermittedException;
+use OCP\IRequest;
+use ownCloud\TarStreamer\TarStreamer;
+use ZipStreamer\ZipStreamer;
+
+class Streamer {
+ // array of regexp. Matching user agents will get tar instead of zip
+ private $preferTarFor = [ '/macintosh|mac os x/i' ];
+
+ // streamer instance
+ private $streamerInstance;
+
+ /**
+ * Streamer constructor.
+ *
+ * @param IRequest $request
+ * @param int $size The size of the files in bytes
+ * @param int $numberOfFiles The number of files (and directories) that will
+ * be included in the streamed file
+ */
+ public function __construct(IRequest $request, $size, int $numberOfFiles){
+
+ /**
+ * zip32 constraints for a basic (without compression, volumes nor
+ * encryption) zip file according to the Zip specification:
+ * - No file size is larger than 4 bytes (file size < 4294967296); see
+ * 4.4.9 uncompressed size
+ * - The size of all files plus their local headers is not larger than
+ * 4 bytes; see 4.4.16 relative offset of local header and 4.4.24
+ * offset of start of central directory with respect to the starting
+ * disk number
+ * - The total number of entries (files and directories) in the zip file
+ * is not larger than 2 bytes (number of entries < 65536); see 4.4.22
+ * total number of entries in the central dir
+ * - The size of the central directory is not larger than 4 bytes; see
+ * 4.4.23 size of the central directory
+ *
+ * Due to all that, zip32 is used if the size is below 4GB and there are
+ * less than 65536 files; the margin between 4*1000^3 and 4*1024^3
+ * should give enough room for the extra zip metadata. Technically, it
+ * would still be possible to create an invalid zip32 file (for example,
+ * a zip file from files smaller than 4GB with a central directory
+ * larger than 4GiB), but it should not happen in the real world.
+ */
+ if ($size < 4 * 1000 * 1000 * 1000 && $numberOfFiles < 65536) {
+ $this->streamerInstance = new ZipStreamer(['zip64' => true]);
+ } else if ($request->isUserAgent($this->preferTarFor)) {
+ $this->streamerInstance = new TarStreamer();
+ } else {
+ $this->streamerInstance = new ZipStreamer(['zip64' => PHP_INT_SIZE !== 4]);
+ }
+ }
+
+ /**
+ * Send HTTP headers
+ * @param string $name
+ */
+ public function sendHeaders($name){
+ $extension = $this->streamerInstance instanceof ZipStreamer ? '.zip' : '.tar';
+ $fullName = $name . $extension;
+ $this->streamerInstance->sendHeaders($fullName);
+ }
+
+ /**
+ * Stream directory recursively
+ *
+ * @throws NotFoundException
+ * @throws NotPermittedException
+ * @throws InvalidPathException
+ */
+ public function addDirRecursive(string $dir, string $internalDir = ''): void {
+ $dirname = basename($dir);
+ $rootDir = $internalDir . $dirname;
+ if (!empty($rootDir)) {
+ $this->streamerInstance->addEmptyDir($rootDir);
+ }
+ $internalDir .= $dirname . '/';
+ // prevent absolute dirs
+ $internalDir = ltrim($internalDir, '/');
+
+ $userFolder = \OC::$server->getRootFolder()->get(Filesystem::getRoot());
+ /** @var Folder $dirNode */
+ $dirNode = $userFolder->get($dir);
+ $files = $dirNode->getDirectoryListing();
+
+ foreach($files as $file) {
+ if($file instanceof File) {
+ try {
+ $fh = $file->fopen('r');
+ } catch (NotPermittedException $e) {
+ continue;
+ }
+ $this->addFileFromStream(
+ $fh,
+ $internalDir . $file->getName(),
+ $file->getSize(),
+ $file->getMTime()
+ );
+ fclose($fh);
+ } elseif ($file instanceof Folder) {
+ if($file->isReadable()) {
+ $this->addDirRecursive($dir . '/' . $file->getName(), $internalDir);
+ }
+ }
+ }
+ }
+
+ /**
+ * Add a file to the archive at the specified location and file name.
+ *
+ * @param string $stream Stream to read data from
+ * @param string $internalName Filepath and name to be used in the archive.
+ * @param int $size Filesize
+ * @param int|bool $time File mtime as int, or false
+ * @return bool $success
+ */
+ public function addFileFromStream($stream, $internalName, $size, $time) {
+ $options = [];
+ if ($time) {
+ $options = [
+ 'timestamp' => $time
+ ];
+ }
+
+ if ($this->streamerInstance instanceof ZipStreamer) {
+ return $this->streamerInstance->addFileFromStream($stream, $internalName, $options);
+ } else {
+ return $this->streamerInstance->addFileFromStream($stream, $internalName, $size, $options);
+ }
+ }
+
+ /**
+ * Add an empty directory entry to the archive.
+ *
+ * @param string $dirName Directory Path and name to be added to the archive.
+ * @return bool $success
+ */
+ public function addEmptyDir($dirName){
+ return $this->streamerInstance->addEmptyDir($dirName);
+ }
+
+ /**
+ * Close the archive.
+ * A closed archive can no longer have new files added to it. After
+ * closing, the file is completely written to the output stream.
+ * @return bool $success
+ */
+ public function finalize(){
+ return $this->streamerInstance->finalize();
+ }
+}
diff --git a/linux/advanced/nextcloud/patched/latest/docker-compose.yml b/linux/advanced/nextcloud/patched/latest/docker-compose.yml
new file mode 100644
index 000000000..b37226e14
--- /dev/null
+++ b/linux/advanced/nextcloud/patched/latest/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+ app:
+ image: "epicmorg/nextcloud:latest-patched"
+ build:
+ context: .
diff --git a/linux/advanced/nextcloud/pure/14/Dockerfile b/linux/advanced/nextcloud/pure/14/Dockerfile
new file mode 100644
index 000000000..b505769ae
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/14/Dockerfile
@@ -0,0 +1,68 @@
+FROM nextcloud:14
+ENV DEBIAN_FRONTEND noninteractive
+
+##################################################################
+# adding normal sources list
+##################################################################
+RUN rm /etc/apt/sources.list
+COPY sources.list /etc/apt/sources.list
+
+##################################################################
+# adding some utils
+##################################################################
+RUN apt update -y && \
+ apt dist-upgrade -y && \
+ apt install -y --allow-unauthenticated \
+ apt-transport-https \
+ curl \
+ ca-certificates \
+ ghostscript \
+ nload \
+ htop \
+ mc \
+ nano \
+ sudo \
+ imagemagick \
+ imagemagick-common \
+ sqlite3 \
+ smbclient \
+ libsmbclient \
+ wget \
+ net-tools \
+ iputils-ping
+
+
+##################################################################
+# installing php repo + smbclient
+##################################################################
+RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
+RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list'
+RUN apt update -y && \
+ apt install -y --allow-unauthenticated \
+ libsmbclient-dev \
+ libmagickwand-dev \
+ libmagickcore-dev \
+ libc-client-dev \
+ libkrb5-dev \
+ libsqlite3-dev \
+ libssl-dev
+
+RUN pecl install inotify && \
+ docker-php-ext-enable inotify
+
+RUN pecl install smbclient && \
+ docker-php-ext-enable smbclient
+
+RUN docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
+ docker-php-ext-install imap && \
+ docker-php-ext-enable imap
+
+RUN docker-php-ext-install fileinfo bz2 intl ftp pdo_sqlite && \
+ docker-php-ext-enable fileinfo bz2 intl ftp pdo_sqlite
+
+##################################################################
+# smb fix
+##################################################################
+RUN rm -frv /etc/samba/smb.conf /usr/share/samba/smb.conf
+ADD smb.conf /etc/samba/
+ADD smb.conf /usr/share/samba/
diff --git a/linux/advanced/nextcloud/pure/14/Makefile b/linux/advanced/nextcloud/pure/14/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/14/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+ make build
+ make deploy
+ make clean
+
+build:
+ docker-compose build --compress --parallel
+
+deploy:
+ docker-compose push
+
+clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
diff --git a/linux/advanced/nextcloud/pure/14/README.md b/linux/advanced/nextcloud/pure/14/README.md
new file mode 100644
index 000000000..b6df71808
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/14/README.md
@@ -0,0 +1,527 @@
+# What is Nextcloud?
+
+[](https://github.com/nextcloud/docker/actions?query=workflow%3AImages)
+[](https://github.com/nextcloud/docker/actions?query=workflow%3Aupdate.sh)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/i386/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/mips64le/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/s390x/job/nextcloud)
+
+A safe home for all your data. Access & share your files, calendars, contacts, mail & more from any device, on your terms.
+
+
+
+# How to use this image
+This image is designed to be used in a micro-service environment. There are two versions of the image you can choose from.
+
+The `apache` tag contains a full Nextcloud installation including an apache web server. It is designed to be easy to use and gets you running pretty fast. This is also the default for the `latest` tag and version tags that are not further specified.
+
+The second option is a `fpm` container. It is based on the [php-fpm](https://hub.docker.com/_/php/) image and runs a fastCGI-Process that serves your Nextcloud page. To use this image it must be combined with any webserver that can proxy the http requests to the FastCGI-port of the container.
+
+[](http://play-with-docker.com?stack=https://raw.githubusercontent.com/nextcloud/docker/8db861d67f257a3e9ac1790ea06d4e2a7a193a6c/stack.yml)
+
+## Using the apache image
+The apache image contains a webserver and exposes port 80. To start the container type:
+
+```console
+$ docker run -d -p 8080:80 nextcloud
+```
+
+Now you can access Nextcloud at http://localhost:8080/ from your host system.
+
+
+## Using the fpm image
+To use the fpm image, you need an additional web server that can proxy http-request to the fpm-port of the container. For fpm connection this container exposes port 9000. In most cases, you might want use another container or your host as proxy.
+If you use your host you can address your Nextcloud container directly on port 9000. If you use another container, make sure that you add them to the same docker network (via `docker run --network ...` or a `docker-compose` file).
+In both cases you don't want to map the fpm port to your host.
+
+```console
+$ docker run -d nextcloud:fpm
+```
+
+As the fastCGI-Process is not capable of serving static files (style sheets, images, ...), the webserver needs access to these files. This can be achieved with the `volumes-from` option. You can find more information in the [docker-compose section](#running-this-image-with-docker-compose).
+
+## Using an external database
+By default, this container uses SQLite for data storage but the Nextcloud setup wizard (appears on first run) allows connecting to an existing MySQL/MariaDB or PostgreSQL database. You can also link a database container, e. g. `--link my-mysql:mysql`, and then use `mysql` as the database host on setup. More info is in the docker-compose section.
+
+## Persistent data
+The Nextcloud installation and all data beyond what lives in the database (file uploads, etc) are stored in the [unnamed docker volume](https://docs.docker.com/engine/tutorials/dockervolumes/#adding-a-data-volume) volume `/var/www/html`. The docker daemon will store that data within the docker directory `/var/lib/docker/volumes/...`. That means your data is saved even if the container crashes, is stopped or deleted.
+
+A named Docker volume or a mounted host directory should be used for upgrades and backups. To achieve this, you need one volume for your database container and one for Nextcloud.
+
+Nextcloud:
+- `/var/www/html/` folder where all nextcloud data lives
+```console
+$ docker run -d \
+-v nextcloud:/var/www/html \
+nextcloud
+```
+
+Database:
+- `/var/lib/mysql` MySQL / MariaDB Data
+- `/var/lib/postgresql/data` PostgreSQL Data
+```console
+$ docker run -d \
+-v db:/var/lib/mysql \
+mariadb
+```
+
+If you want to get fine grained access to your individual files, you can mount additional volumes for data, config, your theme and custom apps.
+The `data`, `config` files are stored in respective subfolders inside `/var/www/html/`. The apps are split into core `apps` (which are shipped with Nextcloud and you don't need to take care of) and a `custom_apps` folder. If you use a custom theme it would go into the `themes` subfolder.
+
+Overview of the folders that can be mounted as volumes:
+
+- `/var/www/html` Main folder, needed for updating
+- `/var/www/html/custom_apps` installed / modified apps
+- `/var/www/html/config` local configuration
+- `/var/www/html/data` the actual data of your Nextcloud
+- `/var/www/html/themes/` theming/branding
+
+If you want to use named volumes for all of these, it would look like this:
+```console
+$ docker run -d \
+-v nextcloud:/var/www/html \
+-v apps:/var/www/html/custom_apps \
+-v config:/var/www/html/config \
+-v data:/var/www/html/data \
+-v theme:/var/www/html/themes/ \
+nextcloud
+```
+
+## Using the Nextcloud command-line interface
+To use the [Nextcloud command-line interface](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/occ_command.html) (aka. `occ` command):
+```console
+$ docker exec --user www-data CONTAINER_ID php occ
+```
+or for docker-compose:
+```console
+$ docker-compose exec --user www-data app php occ
+```
+
+## Auto configuration via environment variables
+The nextcloud image supports auto configuration via environment variables. You can preconfigure everything that is asked on the install page on first run. To enable auto configuration, set your database connection via the following environment variables. ONLY use one database type!
+
+__SQLite__:
+- `SQLITE_DATABASE` Name of the database using sqlite
+
+__MYSQL/MariaDB__:
+- `MYSQL_DATABASE` Name of the database using mysql / mariadb.
+- `MYSQL_USER` Username for the database using mysql / mariadb.
+- `MYSQL_PASSWORD` Password for the database user using mysql / mariadb.
+- `MYSQL_HOST` Hostname of the database server using mysql / mariadb.
+
+__PostgreSQL__:
+- `POSTGRES_DB` Name of the database using postgres.
+- `POSTGRES_USER` Username for the database using postgres.
+- `POSTGRES_PASSWORD` Password for the database user using postgres.
+- `POSTGRES_HOST` Hostname of the database server using postgres.
+
+If you set any values, they will not be asked in the install page on first run. With a complete configuration by using all variables for your database type, you can additionally configure your Nextcloud instance by setting admin user and password (only works if you set both):
+
+- `NEXTCLOUD_ADMIN_USER` Name of the Nextcloud admin user.
+- `NEXTCLOUD_ADMIN_PASSWORD` Password for the Nextcloud admin user.
+
+If you want, you can set the data directory, otherwise default value will be used.
+
+- `NEXTCLOUD_DATA_DIR` (default: _/var/www/html/data_) Configures the data directory where nextcloud stores all files from the users.
+
+One or more trusted domains can be set through environment variable, too. They will be added to the configuration after install.
+
+- `NEXTCLOUD_TRUSTED_DOMAINS` (not set by default) Optional space-separated list of domains
+
+The install and update script is only triggered when a default command is used (`apache-foreground` or `php-fpm`). If you use a custom command you have to enable the install / update with
+
+- `NEXTCLOUD_UPDATE` (default: _0_)
+
+If you want to use Redis you have to create a separate [Redis](https://hub.docker.com/_/redis/) container in your setup / in your docker-compose file. To inform Nextcloud about the Redis container, pass in the following parameters:
+
+- `REDIS_HOST` (not set by default) Name of Redis container
+- `REDIS_HOST_PORT` (default: _6379_) Optional port for Redis, only use for external Redis servers that run on non-standard ports.
+- `REDIS_HOST_PASSWORD` (not set by default) Redis password
+
+The use of Redis is recommended to prevent file locking problems. See the examples for further instructions.
+
+To use an external SMTP server, you have to provide the connection details. To configure Nextcloud to use SMTP add:
+
+- `SMTP_HOST` (not set by default): The hostname of the SMTP server.
+- `SMTP_SECURE` (empty by default): Set to `ssl` to use SSL, or `tls` to use STARTTLS.
+- `SMTP_PORT` (default: `465` for SSL and `25` for non-secure connections): Optional port for the SMTP connection. Use `587` for an alternative port for STARTTLS.
+- `SMTP_AUTHTYPE` (default: `LOGIN`): The method used for authentication. Use `PLAIN` if no authentication is required.
+- `SMTP_NAME` (empty by default): The username for the authentication.
+- `SMTP_PASSWORD` (empty by default): The password for the authentication.
+- `MAIL_FROM_ADDRESS` (not set by default): Use this address for the 'from' field in the emails sent by Nextcloud.
+- `MAIL_DOMAIN` (not set by default): Set a different domain for the emails than the domain where Nextcloud is installed.
+
+Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/email_configuration.html) for other values to configure SMTP.
+
+To use an external S3 compatible object store as primary storage, set the following variables:
+- `OBJECTSTORE_S3_HOST`: The hostname of the object storage server
+- `OBJECTSTORE_S3_BUCKET`: The name of the bucket that Nextcloud should store the data in
+- `OBJECTSTORE_S3_KEY`: AWS style access key
+- `OBJECTSTORE_S3_SECRET`: AWS style secret access key
+- `OBJECTSTORE_S3_PORT`: The port that the object storage server is being served over
+- `OBJECTSTORE_S3_SSL` (default: `true`): Whether or not SSL/TLS should be used to communicate with object storage server
+- `OBJECTSTORE_S3_REGION`: The region that the S3 bucket resides in.
+- `OBJECTSTORE_S3_USEPATH_STYLE` (default: `false`): Not required for AWS S3
+
+Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/primary_storage.html#simple-storage-service-s3) for more information.
+
+To use an external OpenStack Swift object store as primary storage, set the following variables:
+- `OBJECTSTORE_SWIFT_URL`: The Swift identity (Keystone) endpoint
+- `OBJECTSTORE_SWIFT_AUTOCREATE` (default: `false`): Whether or not Nextcloud should automatically create the Swift container
+- `OBJECTSTORE_SWIFT_USER_NAME`: Swift username
+- `OBJECTSTORE_SWIFT_USER_PASSWORD`: Swift user password
+- `OBJECTSTORE_SWIFT_USER_DOMAIN` (default: `Default`): Swift user domain
+- `OBJECTSTORE_SWIFT_PROJECT_NAME`: OpenStack project name
+- `OBJECTSTORE_SWIFT_PROJECT_DOMAIN` (default: `Default`): OpenStack project domain
+- `OBJECTSTORE_SWIFT_SERVICE_NAME` (default: `swift`): Swift service name
+- `OBJECTSTORE_SWIFT_SERVICE_REGION`: Swift endpoint region
+- `OBJECTSTORE_SWIFT_CONTAINER_NAME`: Swift container (bucket) that Nextcloud should store the data in
+
+Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/primary_storage.html#openstack-swift) for more information.
+
+
+## Using the apache image behind a reverse proxy and auto configure server host and protocol
+
+The apache image will replace the remote addr (ip address visible to Nextcloud) with the ip address from `X-Real-IP` if the request is coming from a proxy in 10.0.0.0/8, 172.16.0.0/12 or 192.168.0.0/16 by default. If you want Nextcloud to pick up the server host (`HTTP_X_FORWARDED_HOST`), protocol (`HTTP_X_FORWARDED_PROTO`) and client ip (`HTTP_X_FORWARDED_FOR`) from a trusted proxy disable rewrite ip and the reverse proxies ip address to `TRUSTED_PROXIES`.
+
+- `APACHE_DISABLE_REWRITE_IP` (not set by default): Set to 1 to disable rewrite ip.
+
+- `TRUSTED_PROXIES` (empty by default): A space-separated list of trusted proxies. CIDR notation is supported for IPv4.
+
+If the `TRUSTED_PROXIES` approach does not work for you, try using fixed values for overwrite parameters.
+
+- `OVERWRITEHOST` (empty by default): Set the hostname of the proxy. Can also specify a port.
+- `OVERWRITEPROTOCOL` (empty by default): Set the protocol of the proxy, http or https.
+- `OVERWRITEWEBROOT` (empty by default): Set the absolute path of the proxy.
+- `OVERWRITECONDADDR` (empty by default): Regex to overwrite the values dependent on the remote address.
+
+Check the [Nexcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/reverse_proxy_configuration.html) for more details.
+
+Keep in mind that once set, removing these environment variables won't remove these values from the configuration file, due to how Nextcloud merges configuration files together.
+
+# Running this image with docker-compose
+The easiest way to get a fully featured and functional setup is using a `docker-compose` file. There are too many different possibilities to setup your system, so here are only some examples of what you have to look for.
+
+At first, make sure you have chosen the right base image (fpm or apache) and added features you wanted (see below). In every case, you would want to add a database container and docker volumes to get easy access to your persistent data. When you want to have your server reachable from the internet, adding HTTPS-encryption is mandatory! See below for more information.
+
+## Base version - apache
+This version will use the apache image and add a mariaDB container. The volumes are set to keep your data persistent. This setup provides **no ssl encryption** and is intended to run behind a proxy.
+
+Make sure to pass in values for `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` variables before you run this setup.
+
+```yaml
+version: '2'
+
+volumes:
+ nextcloud:
+ db:
+
+services:
+ db:
+ image: mariadb
+ command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+ restart: always
+ volumes:
+ - db:/var/lib/mysql
+ environment:
+ - MYSQL_ROOT_PASSWORD=
+ - MYSQL_PASSWORD=
+ - MYSQL_DATABASE=nextcloud
+ - MYSQL_USER=nextcloud
+
+ app:
+ image: nextcloud
+ ports:
+ - 8080:80
+ links:
+ - db
+ volumes:
+ - nextcloud:/var/www/html
+ restart: always
+
+```
+
+Then run `docker-compose up -d`, now you can access Nextcloud at http://localhost:8080/ from your host system.
+
+## Base version - FPM
+When using the FPM image, you need another container that acts as web server on port 80 and proxies the requests to the Nextcloud container. In this example a simple nginx container is combined with the Nextcloud-fpm image and a MariaDB database container. The data is stored in docker volumes. The nginx container also needs access to static files from your Nextcloud installation. It gets access to all the volumes mounted to Nextcloud via the `volumes_from` option.The configuration for nginx is stored in the configuration file `nginx.conf`, that is mounted into the container. An example can be found in the examples section [here](https://github.com/nextcloud/docker/tree/master/.examples).
+
+As this setup does **not include encryption**, it should be run behind a proxy.
+
+Make sure to pass in values for `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` variables before you run this setup.
+
+```yaml
+version: '2'
+
+volumes:
+ nextcloud:
+ db:
+
+services:
+ db:
+ image: mariadb
+ command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+ restart: always
+ volumes:
+ - db:/var/lib/mysql
+ environment:
+ - MYSQL_ROOT_PASSWORD=
+ - MYSQL_PASSWORD=
+ - MYSQL_DATABASE=nextcloud
+ - MYSQL_USER=nextcloud
+
+ app:
+ image: nextcloud:fpm
+ links:
+ - db
+ volumes:
+ - nextcloud:/var/www/html
+ restart: always
+
+ web:
+ image: nginx
+ ports:
+ - 8080:80
+ links:
+ - app
+ volumes:
+ - ./nginx.conf:/etc/nginx/nginx.conf:ro
+ volumes_from:
+ - app
+ restart: always
+```
+
+Then run `docker-compose up -d`, now you can access Nextcloud at http://localhost:8080/ from your host system.
+
+# Docker Secrets
+As an alternative to passing sensitive information via environment variables, _FILE may be appended to the previously listed environment variables, causing the initialization script to load the values for those variables from files present in the container. In particular, this can be used to load passwords from Docker secrets stored in /run/secrets/ files. For example:
+```yaml
+version: '3.2'
+
+services:
+ db:
+ image: postgres
+ restart: always
+ volumes:
+ - db:/var/lib/postgresql/data
+ environment:
+ - POSTGRES_DB_FILE=/run/secrets/postgres_db
+ - POSTGRES_USER_FILE=/run/secrets/postgres_user
+ - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
+ secrets:
+ - postgres_db
+ - postgres_password
+ - postgres_user
+
+ app:
+ image: nextcloud
+ restart: always
+ ports:
+ - 8080:80
+ volumes:
+ - nextcloud:/var/www/html
+ environment:
+ - POSTGRES_HOST=db
+ - POSTGRES_DB_FILE=/run/secrets/postgres_db
+ - POSTGRES_USER_FILE=/run/secrets/postgres_user
+ - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
+ - NEXTCLOUD_ADMIN_PASSWORD_FILE=/run/secrets/nextcloud_admin_password
+ - NEXTCLOUD_ADMIN_USER_FILE=/run/secrets/nextcloud_admin_user
+ depends_on:
+ - db
+ secrets:
+ - nextcloud_admin_password
+ - nextcloud_admin_user
+ - postgres_db
+ - postgres_password
+ - postgres_user
+
+volumes:
+ db:
+ nextcloud:
+
+secrets:
+ nextcloud_admin_password:
+ file: ./nextcloud_admin_password.txt # put admin password to this file
+ nextcloud_admin_user:
+ file: ./nextcloud_admin_user.txt # put admin username to this file
+ postgres_db:
+ file: ./postgres_db.txt # put postgresql db name to this file
+ postgres_password:
+ file: ./postgres_password.txt # put postgresql password to this file
+ postgres_user:
+ file: ./postgres_user.txt # put postgresql username to this file
+```
+
+Currently, this is only supported for `NEXTCLOUD_ADMIN_PASSWORD`, `NEXTCLOUD_ADMIN_USER`, `MYSQL_DB`, `MYSQL_PASSWORD`, `MYSQL_USER`, `POSTGRES_DB`, `POSTGRES_PASSWORD`, `POSTGRES_USER`.
+
+# Make your Nextcloud available from the internet
+Until here, your Nextcloud is just available from you docker host. If you want your Nextcloud available from the internet adding SSL encryption is mandatory.
+
+## HTTPS - SSL encryption
+There are many different possibilities to introduce encryption depending on your setup.
+
+We recommend using a reverse proxy in front of our Nextcloud installation. Your Nextcloud will only be reachable through the proxy, which encrypts all traffic to the clients. You can mount your manually generated certificates to the proxy or use a fully automated solution which generates and renews the certificates for you.
+
+In our [examples](https://github.com/nextcloud/docker/tree/master/.examples) section we have an example for a fully automated setup using a reverse proxy, a container for [Let's Encrypt](https://letsencrypt.org/) certificate handling, database and Nextcloud. It uses the popular [nginx-proxy](https://github.com/jwilder/nginx-proxy) and [docker-letsencrypt-nginx-proxy-companion](https://github.com/JrCs/docker-letsencrypt-nginx-proxy-companion) containers. Please check the according documentations before using this setup.
+
+# First use
+When you first access your Nextcloud, the setup wizard will appear and ask you to choose an administrator account username, password and the database connection. For the database use `db` as host and `nextcloud` as table and user name. Also enter the password you chose in your `docker-compose.yml` file.
+
+# Update to a newer version
+Updating the Nextcloud container is done by pulling the new image, throwing away the old container and starting the new one.
+
+**It is only possible to upgrade one major version at a time. For example, if you want to upgrade from version 14 to 16, you will have to upgrade from version 14 to 15, then from 15 to 16.**
+
+Since all data is stored in volumes, nothing gets lost. The startup script will check for the version in your volume and the installed docker version. If it finds a mismatch, it automatically starts the upgrade process. Don't forget to add all the volumes to your new container, so it works as expected.
+
+```console
+$ docker pull nextcloud
+$ docker stop
+$ docker rm
+$ docker run -d nextcloud
+```
+Beware that you have to run the same command with the options that you used to initially start your Nextcloud. That includes volumes, port mapping.
+
+When using docker-compose your compose file takes care of your configuration, so you just have to run:
+
+```console
+$ docker-compose pull
+$ docker-compose up -d
+```
+
+
+# Adding Features
+A lot of people want to use additional functionality inside their Nextcloud installation. If the image does not include the packages you need, you can easily build your own image on top of it.
+Start your derived image with the `FROM` statement and add whatever you like.
+
+```yaml
+FROM nextcloud:apache
+
+RUN ...
+
+```
+The [examples folder](https://github.com/nextcloud/docker/blob/master/.examples) gives a few examples on how to add certain functionalities, like including the cron job, smb-support or imap-authentication.
+
+If you use your own Dockerfile, you need to configure your docker-compose file accordingly. Switch out the `image` option with `build`. You have to specify the path to your Dockerfile. (in the example it's in the same directory next to the docker-compose file)
+
+```yaml
+ app:
+ build: .
+ links:
+ - db
+ volumes:
+ - data:/var/www/html/data
+ - config:/var/www/html/config
+ - apps:/var/www/html/apps
+ restart: always
+```
+
+If you intend to use another command to run the image, make sure that you set `NEXTCLOUD_UPDATE=1` in your Dockerfile. Otherwise the installation and update will not work.
+
+```yaml
+FROM nextcloud:apache
+
+...
+
+ENV NEXTCLOUD_UPDATE=1
+
+CMD ["/usr/bin/supervisord"]
+```
+
+
+**Updating** your own derived image is also very simple. When a new version of the Nextcloud image is available run:
+
+```console
+docker build -t your-name --pull .
+docker run -d your-name
+```
+
+or for docker-compose:
+```console
+docker-compose build --pull
+docker-compose up -d
+```
+
+The `--pull` option tells docker to look for new versions of the base image. Then the build instructions inside your `Dockerfile` are run on top of the new image.
+
+# Migrating an existing installation
+You're already using Nextcloud and want to switch to docker? Great! Here are some things to look out for:
+
+1. Define your whole Nextcloud infrastructure in a `docker-compose` file and run it with `docker-compose up -d` to get the base installation, volumes and database. Work from there.
+2. Restore your database from a mysqldump (nextcloud\_db\_1 is the name of your db container)
+ - To import from a MySQL dump use the following commands
+ ```console
+ docker cp ./database.dmp nextcloud_db_1:/dmp
+ docker-compose exec db sh -c "mysql -u USER -pPASSWORD nextcloud < /dmp"
+ docker-compose exec db rm /dmp
+ ```
+ - To import from a PostgreSQL dump use to following commands
+ ```console
+ docker cp ./database.dmp nextcloud_db_1:/dmp
+ docker-compose exec db sh -c "psql -U USER --set ON_ERROR_STOP=on nextcloud < /dmp"
+ docker-compose exec db rm /dmp
+ ```
+3. Edit your config.php
+ 1. Set database connection
+ - In case of MySQL database
+ ```php
+ 'dbhost' => 'db:3306',
+ ```
+ - In case of PostgreSQL database
+ ```php
+ 'dbhost' => 'db:5432',
+ ```
+ 2. Make sure you have no configuration for the `apps_paths`. Delete lines like these
+ ```diff
+ - "apps_paths" => array (
+ - 0 => array (
+ - "path" => OC::$SERVERROOT."/apps",
+ - "url" => "/apps",
+ - "writable" => true,
+ - ),
+ ```
+ 3. Make sure to have the `apps` directory non writable and the `custom_apps` directory writable
+ ```php
+ 'apps_paths' => array (
+ 0 => array (
+ 'path' => '/var/www/html/apps',
+ 'url' => '/apps',
+ 'writable' => false,
+ ),
+ 1 => array (
+ 'path' => '/var/www/html/custom_apps',
+ 'url' => '/custom_apps',
+ 'writable' => true,
+ ),
+ ),
+ ```
+ 4. Make sure your data directory is set to /var/www/html/data
+ ```php
+ 'datadirectory' => '/var/www/html/data',
+ ```
+
+
+4. Copy your data (nextcloud_app_1 is the name of your Nextcloud container):
+```console
+docker cp ./data/ nextcloud_app_1:/var/www/html/
+docker-compose exec app chown -R www-data:www-data /var/www/html/data
+docker cp ./theming/ nextcloud_app_1:/var/www/html/
+docker-compose exec app chown -R www-data:www-data /var/www/html/theming
+docker cp ./config/config.php nextcloud_app_1:/var/www/html/config
+docker-compose exec app chown -R www-data:www-data /var/www/html/config
+```
+5. Copy only the custom apps you use (or simply redownload them from the web interface):
+```console
+docker cp ./custom_apps/ nextcloud_data:/var/www/html/
+docker-compose exec app chown -R www-data:www-data /var/www/html/custom_apps
+```
+
+# Questions / Issues
+If you got any questions or problems using the image, please visit our [Github Repository](https://github.com/nextcloud/docker) and write an issue.
diff --git a/linux/advanced/nextcloud/pure/14/docker-compose.yml b/linux/advanced/nextcloud/pure/14/docker-compose.yml
new file mode 100644
index 000000000..f5201d94a
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/14/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+ app:
+ image: "epicmorg/nextcloud:14"
+ build:
+ context: .
diff --git a/linux/nextcloud/14/smb.conf b/linux/advanced/nextcloud/pure/14/smb.conf
similarity index 100%
rename from linux/nextcloud/14/smb.conf
rename to linux/advanced/nextcloud/pure/14/smb.conf
diff --git a/linux/advanced/nextcloud/pure/14/sources.list b/linux/advanced/nextcloud/pure/14/sources.list
new file mode 100644
index 000000000..5a8c0081a
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/14/sources.list
@@ -0,0 +1,21 @@
+#main
+deb http://httpredir.debian.org/debian/ bullseye main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye main contrib non-free
+deb http://httpredir.debian.org/debian/ bullseye-updates main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye-updates main contrib non-free
+deb http://httpredir.debian.org/debian/ bullseye-backports main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye-backports main contrib non-free
+deb http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib non-free
+
+#security
+deb http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free
+deb-src http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free
+deb http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free
+deb-src http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free
+
+##multimedia
+# deb http://httpredir.debian.org/debian-multimedia/ bullseye main non-free
+# deb-src http://httpredir.debian.org/debian-multimedia/ bullseye main non-free
+# deb http://httpredir.debian.org/debian-multimedia/ bullseye-backports main
+# deb-src http://httpredir.debian.org/debian-multimedia/ bullseye-backports main
diff --git a/linux/advanced/nextcloud/pure/15/Dockerfile b/linux/advanced/nextcloud/pure/15/Dockerfile
new file mode 100644
index 000000000..343a7a71f
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/15/Dockerfile
@@ -0,0 +1,68 @@
+FROM nextcloud:15
+ENV DEBIAN_FRONTEND noninteractive
+
+##################################################################
+# adding normal sources list
+##################################################################
+RUN rm /etc/apt/sources.list
+COPY sources.list /etc/apt/sources.list
+
+##################################################################
+# adding some utils
+##################################################################
+RUN apt update -y && \
+ apt dist-upgrade -y && \
+ apt install -y --allow-unauthenticated \
+ apt-transport-https \
+ curl \
+ ca-certificates \
+ ghostscript \
+ nload \
+ htop \
+ mc \
+ nano \
+ sudo \
+ imagemagick \
+ imagemagick-common \
+ sqlite3 \
+ smbclient \
+ libsmbclient \
+ wget \
+ net-tools \
+ iputils-ping
+
+
+##################################################################
+# installing php repo + smbclient
+##################################################################
+RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
+RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list'
+RUN apt update -y && \
+ apt install -y --allow-unauthenticated \
+ libsmbclient-dev \
+ libmagickwand-dev \
+ libmagickcore-dev \
+ libc-client-dev \
+ libkrb5-dev \
+ libsqlite3-dev \
+ libssl-dev
+
+RUN pecl install inotify && \
+ docker-php-ext-enable inotify
+
+RUN pecl install smbclient && \
+ docker-php-ext-enable smbclient
+
+RUN docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
+ docker-php-ext-install imap && \
+ docker-php-ext-enable imap
+
+RUN docker-php-ext-install fileinfo bz2 intl ftp pdo_sqlite && \
+ docker-php-ext-enable fileinfo bz2 intl ftp pdo_sqlite
+
+##################################################################
+# smb fix
+##################################################################
+RUN rm -frv /etc/samba/smb.conf /usr/share/samba/smb.conf
+ADD smb.conf /etc/samba/
+ADD smb.conf /usr/share/samba/
diff --git a/linux/advanced/nextcloud/pure/15/Makefile b/linux/advanced/nextcloud/pure/15/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/15/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+ make build
+ make deploy
+ make clean
+
+build:
+ docker-compose build --compress --parallel
+
+deploy:
+ docker-compose push
+
+clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
diff --git a/linux/advanced/nextcloud/pure/15/README.md b/linux/advanced/nextcloud/pure/15/README.md
new file mode 100644
index 000000000..b6df71808
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/15/README.md
@@ -0,0 +1,527 @@
+# What is Nextcloud?
+
+[](https://github.com/nextcloud/docker/actions?query=workflow%3AImages)
+[](https://github.com/nextcloud/docker/actions?query=workflow%3Aupdate.sh)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/i386/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/mips64le/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/s390x/job/nextcloud)
+
+A safe home for all your data. Access & share your files, calendars, contacts, mail & more from any device, on your terms.
+
+
+
+# How to use this image
+This image is designed to be used in a micro-service environment. There are two versions of the image you can choose from.
+
+The `apache` tag contains a full Nextcloud installation including an apache web server. It is designed to be easy to use and gets you running pretty fast. This is also the default for the `latest` tag and version tags that are not further specified.
+
+The second option is a `fpm` container. It is based on the [php-fpm](https://hub.docker.com/_/php/) image and runs a fastCGI-Process that serves your Nextcloud page. To use this image it must be combined with any webserver that can proxy the http requests to the FastCGI-port of the container.
+
+[](http://play-with-docker.com?stack=https://raw.githubusercontent.com/nextcloud/docker/8db861d67f257a3e9ac1790ea06d4e2a7a193a6c/stack.yml)
+
+## Using the apache image
+The apache image contains a webserver and exposes port 80. To start the container type:
+
+```console
+$ docker run -d -p 8080:80 nextcloud
+```
+
+Now you can access Nextcloud at http://localhost:8080/ from your host system.
+
+
+## Using the fpm image
+To use the fpm image, you need an additional web server that can proxy http-request to the fpm-port of the container. For fpm connection this container exposes port 9000. In most cases, you might want use another container or your host as proxy.
+If you use your host you can address your Nextcloud container directly on port 9000. If you use another container, make sure that you add them to the same docker network (via `docker run --network ...` or a `docker-compose` file).
+In both cases you don't want to map the fpm port to your host.
+
+```console
+$ docker run -d nextcloud:fpm
+```
+
+As the fastCGI-Process is not capable of serving static files (style sheets, images, ...), the webserver needs access to these files. This can be achieved with the `volumes-from` option. You can find more information in the [docker-compose section](#running-this-image-with-docker-compose).
+
+## Using an external database
+By default, this container uses SQLite for data storage but the Nextcloud setup wizard (appears on first run) allows connecting to an existing MySQL/MariaDB or PostgreSQL database. You can also link a database container, e. g. `--link my-mysql:mysql`, and then use `mysql` as the database host on setup. More info is in the docker-compose section.
+
+## Persistent data
+The Nextcloud installation and all data beyond what lives in the database (file uploads, etc) are stored in the [unnamed docker volume](https://docs.docker.com/engine/tutorials/dockervolumes/#adding-a-data-volume) volume `/var/www/html`. The docker daemon will store that data within the docker directory `/var/lib/docker/volumes/...`. That means your data is saved even if the container crashes, is stopped or deleted.
+
+A named Docker volume or a mounted host directory should be used for upgrades and backups. To achieve this, you need one volume for your database container and one for Nextcloud.
+
+Nextcloud:
+- `/var/www/html/` folder where all nextcloud data lives
+```console
+$ docker run -d \
+-v nextcloud:/var/www/html \
+nextcloud
+```
+
+Database:
+- `/var/lib/mysql` MySQL / MariaDB Data
+- `/var/lib/postgresql/data` PostgreSQL Data
+```console
+$ docker run -d \
+-v db:/var/lib/mysql \
+mariadb
+```
+
+If you want to get fine grained access to your individual files, you can mount additional volumes for data, config, your theme and custom apps.
+The `data`, `config` files are stored in respective subfolders inside `/var/www/html/`. The apps are split into core `apps` (which are shipped with Nextcloud and you don't need to take care of) and a `custom_apps` folder. If you use a custom theme it would go into the `themes` subfolder.
+
+Overview of the folders that can be mounted as volumes:
+
+- `/var/www/html` Main folder, needed for updating
+- `/var/www/html/custom_apps` installed / modified apps
+- `/var/www/html/config` local configuration
+- `/var/www/html/data` the actual data of your Nextcloud
+- `/var/www/html/themes/` theming/branding
+
+If you want to use named volumes for all of these, it would look like this:
+```console
+$ docker run -d \
+-v nextcloud:/var/www/html \
+-v apps:/var/www/html/custom_apps \
+-v config:/var/www/html/config \
+-v data:/var/www/html/data \
+-v theme:/var/www/html/themes/ \
+nextcloud
+```
+
+## Using the Nextcloud command-line interface
+To use the [Nextcloud command-line interface](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/occ_command.html) (aka. `occ` command):
+```console
+$ docker exec --user www-data CONTAINER_ID php occ
+```
+or for docker-compose:
+```console
+$ docker-compose exec --user www-data app php occ
+```
+
+## Auto configuration via environment variables
+The nextcloud image supports auto configuration via environment variables. You can preconfigure everything that is asked on the install page on first run. To enable auto configuration, set your database connection via the following environment variables. ONLY use one database type!
+
+__SQLite__:
+- `SQLITE_DATABASE` Name of the database using sqlite
+
+__MYSQL/MariaDB__:
+- `MYSQL_DATABASE` Name of the database using mysql / mariadb.
+- `MYSQL_USER` Username for the database using mysql / mariadb.
+- `MYSQL_PASSWORD` Password for the database user using mysql / mariadb.
+- `MYSQL_HOST` Hostname of the database server using mysql / mariadb.
+
+__PostgreSQL__:
+- `POSTGRES_DB` Name of the database using postgres.
+- `POSTGRES_USER` Username for the database using postgres.
+- `POSTGRES_PASSWORD` Password for the database user using postgres.
+- `POSTGRES_HOST` Hostname of the database server using postgres.
+
+If you set any values, they will not be asked in the install page on first run. With a complete configuration by using all variables for your database type, you can additionally configure your Nextcloud instance by setting admin user and password (only works if you set both):
+
+- `NEXTCLOUD_ADMIN_USER` Name of the Nextcloud admin user.
+- `NEXTCLOUD_ADMIN_PASSWORD` Password for the Nextcloud admin user.
+
+If you want, you can set the data directory, otherwise default value will be used.
+
+- `NEXTCLOUD_DATA_DIR` (default: _/var/www/html/data_) Configures the data directory where nextcloud stores all files from the users.
+
+One or more trusted domains can be set through environment variable, too. They will be added to the configuration after install.
+
+- `NEXTCLOUD_TRUSTED_DOMAINS` (not set by default) Optional space-separated list of domains
+
+The install and update script is only triggered when a default command is used (`apache-foreground` or `php-fpm`). If you use a custom command you have to enable the install / update with
+
+- `NEXTCLOUD_UPDATE` (default: _0_)
+
+If you want to use Redis you have to create a separate [Redis](https://hub.docker.com/_/redis/) container in your setup / in your docker-compose file. To inform Nextcloud about the Redis container, pass in the following parameters:
+
+- `REDIS_HOST` (not set by default) Name of Redis container
+- `REDIS_HOST_PORT` (default: _6379_) Optional port for Redis, only use for external Redis servers that run on non-standard ports.
+- `REDIS_HOST_PASSWORD` (not set by default) Redis password
+
+The use of Redis is recommended to prevent file locking problems. See the examples for further instructions.
+
+To use an external SMTP server, you have to provide the connection details. To configure Nextcloud to use SMTP add:
+
+- `SMTP_HOST` (not set by default): The hostname of the SMTP server.
+- `SMTP_SECURE` (empty by default): Set to `ssl` to use SSL, or `tls` to use STARTTLS.
+- `SMTP_PORT` (default: `465` for SSL and `25` for non-secure connections): Optional port for the SMTP connection. Use `587` for an alternative port for STARTTLS.
+- `SMTP_AUTHTYPE` (default: `LOGIN`): The method used for authentication. Use `PLAIN` if no authentication is required.
+- `SMTP_NAME` (empty by default): The username for the authentication.
+- `SMTP_PASSWORD` (empty by default): The password for the authentication.
+- `MAIL_FROM_ADDRESS` (not set by default): Use this address for the 'from' field in the emails sent by Nextcloud.
+- `MAIL_DOMAIN` (not set by default): Set a different domain for the emails than the domain where Nextcloud is installed.
+
+Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/email_configuration.html) for other values to configure SMTP.
+
+To use an external S3 compatible object store as primary storage, set the following variables:
+- `OBJECTSTORE_S3_HOST`: The hostname of the object storage server
+- `OBJECTSTORE_S3_BUCKET`: The name of the bucket that Nextcloud should store the data in
+- `OBJECTSTORE_S3_KEY`: AWS style access key
+- `OBJECTSTORE_S3_SECRET`: AWS style secret access key
+- `OBJECTSTORE_S3_PORT`: The port that the object storage server is being served over
+- `OBJECTSTORE_S3_SSL` (default: `true`): Whether or not SSL/TLS should be used to communicate with object storage server
+- `OBJECTSTORE_S3_REGION`: The region that the S3 bucket resides in.
+- `OBJECTSTORE_S3_USEPATH_STYLE` (default: `false`): Not required for AWS S3
+
+Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/primary_storage.html#simple-storage-service-s3) for more information.
+
+To use an external OpenStack Swift object store as primary storage, set the following variables:
+- `OBJECTSTORE_SWIFT_URL`: The Swift identity (Keystone) endpoint
+- `OBJECTSTORE_SWIFT_AUTOCREATE` (default: `false`): Whether or not Nextcloud should automatically create the Swift container
+- `OBJECTSTORE_SWIFT_USER_NAME`: Swift username
+- `OBJECTSTORE_SWIFT_USER_PASSWORD`: Swift user password
+- `OBJECTSTORE_SWIFT_USER_DOMAIN` (default: `Default`): Swift user domain
+- `OBJECTSTORE_SWIFT_PROJECT_NAME`: OpenStack project name
+- `OBJECTSTORE_SWIFT_PROJECT_DOMAIN` (default: `Default`): OpenStack project domain
+- `OBJECTSTORE_SWIFT_SERVICE_NAME` (default: `swift`): Swift service name
+- `OBJECTSTORE_SWIFT_SERVICE_REGION`: Swift endpoint region
+- `OBJECTSTORE_SWIFT_CONTAINER_NAME`: Swift container (bucket) that Nextcloud should store the data in
+
+Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/primary_storage.html#openstack-swift) for more information.
+
+
+## Using the apache image behind a reverse proxy and auto configure server host and protocol
+
+The apache image will replace the remote addr (ip address visible to Nextcloud) with the ip address from `X-Real-IP` if the request is coming from a proxy in 10.0.0.0/8, 172.16.0.0/12 or 192.168.0.0/16 by default. If you want Nextcloud to pick up the server host (`HTTP_X_FORWARDED_HOST`), protocol (`HTTP_X_FORWARDED_PROTO`) and client ip (`HTTP_X_FORWARDED_FOR`) from a trusted proxy disable rewrite ip and the reverse proxies ip address to `TRUSTED_PROXIES`.
+
+- `APACHE_DISABLE_REWRITE_IP` (not set by default): Set to 1 to disable rewrite ip.
+
+- `TRUSTED_PROXIES` (empty by default): A space-separated list of trusted proxies. CIDR notation is supported for IPv4.
+
+If the `TRUSTED_PROXIES` approach does not work for you, try using fixed values for overwrite parameters.
+
+- `OVERWRITEHOST` (empty by default): Set the hostname of the proxy. Can also specify a port.
+- `OVERWRITEPROTOCOL` (empty by default): Set the protocol of the proxy, http or https.
+- `OVERWRITEWEBROOT` (empty by default): Set the absolute path of the proxy.
+- `OVERWRITECONDADDR` (empty by default): Regex to overwrite the values dependent on the remote address.
+
+Check the [Nexcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/reverse_proxy_configuration.html) for more details.
+
+Keep in mind that once set, removing these environment variables won't remove these values from the configuration file, due to how Nextcloud merges configuration files together.
+
+# Running this image with docker-compose
+The easiest way to get a fully featured and functional setup is using a `docker-compose` file. There are too many different possibilities to setup your system, so here are only some examples of what you have to look for.
+
+At first, make sure you have chosen the right base image (fpm or apache) and added features you wanted (see below). In every case, you would want to add a database container and docker volumes to get easy access to your persistent data. When you want to have your server reachable from the internet, adding HTTPS-encryption is mandatory! See below for more information.
+
+## Base version - apache
+This version will use the apache image and add a mariaDB container. The volumes are set to keep your data persistent. This setup provides **no ssl encryption** and is intended to run behind a proxy.
+
+Make sure to pass in values for `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` variables before you run this setup.
+
+```yaml
+version: '2'
+
+volumes:
+ nextcloud:
+ db:
+
+services:
+ db:
+ image: mariadb
+ command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+ restart: always
+ volumes:
+ - db:/var/lib/mysql
+ environment:
+ - MYSQL_ROOT_PASSWORD=
+ - MYSQL_PASSWORD=
+ - MYSQL_DATABASE=nextcloud
+ - MYSQL_USER=nextcloud
+
+ app:
+ image: nextcloud
+ ports:
+ - 8080:80
+ links:
+ - db
+ volumes:
+ - nextcloud:/var/www/html
+ restart: always
+
+```
+
+Then run `docker-compose up -d`, now you can access Nextcloud at http://localhost:8080/ from your host system.
+
+## Base version - FPM
+When using the FPM image, you need another container that acts as web server on port 80 and proxies the requests to the Nextcloud container. In this example a simple nginx container is combined with the Nextcloud-fpm image and a MariaDB database container. The data is stored in docker volumes. The nginx container also needs access to static files from your Nextcloud installation. It gets access to all the volumes mounted to Nextcloud via the `volumes_from` option.The configuration for nginx is stored in the configuration file `nginx.conf`, that is mounted into the container. An example can be found in the examples section [here](https://github.com/nextcloud/docker/tree/master/.examples).
+
+As this setup does **not include encryption**, it should be run behind a proxy.
+
+Make sure to pass in values for `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` variables before you run this setup.
+
+```yaml
+version: '2'
+
+volumes:
+ nextcloud:
+ db:
+
+services:
+ db:
+ image: mariadb
+ command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+ restart: always
+ volumes:
+ - db:/var/lib/mysql
+ environment:
+ - MYSQL_ROOT_PASSWORD=
+ - MYSQL_PASSWORD=
+ - MYSQL_DATABASE=nextcloud
+ - MYSQL_USER=nextcloud
+
+ app:
+ image: nextcloud:fpm
+ links:
+ - db
+ volumes:
+ - nextcloud:/var/www/html
+ restart: always
+
+ web:
+ image: nginx
+ ports:
+ - 8080:80
+ links:
+ - app
+ volumes:
+ - ./nginx.conf:/etc/nginx/nginx.conf:ro
+ volumes_from:
+ - app
+ restart: always
+```
+
+Then run `docker-compose up -d`, now you can access Nextcloud at http://localhost:8080/ from your host system.
+
+# Docker Secrets
+As an alternative to passing sensitive information via environment variables, _FILE may be appended to the previously listed environment variables, causing the initialization script to load the values for those variables from files present in the container. In particular, this can be used to load passwords from Docker secrets stored in /run/secrets/ files. For example:
+```yaml
+version: '3.2'
+
+services:
+ db:
+ image: postgres
+ restart: always
+ volumes:
+ - db:/var/lib/postgresql/data
+ environment:
+ - POSTGRES_DB_FILE=/run/secrets/postgres_db
+ - POSTGRES_USER_FILE=/run/secrets/postgres_user
+ - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
+ secrets:
+ - postgres_db
+ - postgres_password
+ - postgres_user
+
+ app:
+ image: nextcloud
+ restart: always
+ ports:
+ - 8080:80
+ volumes:
+ - nextcloud:/var/www/html
+ environment:
+ - POSTGRES_HOST=db
+ - POSTGRES_DB_FILE=/run/secrets/postgres_db
+ - POSTGRES_USER_FILE=/run/secrets/postgres_user
+ - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
+ - NEXTCLOUD_ADMIN_PASSWORD_FILE=/run/secrets/nextcloud_admin_password
+ - NEXTCLOUD_ADMIN_USER_FILE=/run/secrets/nextcloud_admin_user
+ depends_on:
+ - db
+ secrets:
+ - nextcloud_admin_password
+ - nextcloud_admin_user
+ - postgres_db
+ - postgres_password
+ - postgres_user
+
+volumes:
+ db:
+ nextcloud:
+
+secrets:
+ nextcloud_admin_password:
+ file: ./nextcloud_admin_password.txt # put admin password to this file
+ nextcloud_admin_user:
+ file: ./nextcloud_admin_user.txt # put admin username to this file
+ postgres_db:
+ file: ./postgres_db.txt # put postgresql db name to this file
+ postgres_password:
+ file: ./postgres_password.txt # put postgresql password to this file
+ postgres_user:
+ file: ./postgres_user.txt # put postgresql username to this file
+```
+
+Currently, this is only supported for `NEXTCLOUD_ADMIN_PASSWORD`, `NEXTCLOUD_ADMIN_USER`, `MYSQL_DB`, `MYSQL_PASSWORD`, `MYSQL_USER`, `POSTGRES_DB`, `POSTGRES_PASSWORD`, `POSTGRES_USER`.
+
+# Make your Nextcloud available from the internet
+Until here, your Nextcloud is just available from you docker host. If you want your Nextcloud available from the internet adding SSL encryption is mandatory.
+
+## HTTPS - SSL encryption
+There are many different possibilities to introduce encryption depending on your setup.
+
+We recommend using a reverse proxy in front of our Nextcloud installation. Your Nextcloud will only be reachable through the proxy, which encrypts all traffic to the clients. You can mount your manually generated certificates to the proxy or use a fully automated solution which generates and renews the certificates for you.
+
+In our [examples](https://github.com/nextcloud/docker/tree/master/.examples) section we have an example for a fully automated setup using a reverse proxy, a container for [Let's Encrypt](https://letsencrypt.org/) certificate handling, database and Nextcloud. It uses the popular [nginx-proxy](https://github.com/jwilder/nginx-proxy) and [docker-letsencrypt-nginx-proxy-companion](https://github.com/JrCs/docker-letsencrypt-nginx-proxy-companion) containers. Please check the according documentations before using this setup.
+
+# First use
+When you first access your Nextcloud, the setup wizard will appear and ask you to choose an administrator account username, password and the database connection. For the database use `db` as host and `nextcloud` as table and user name. Also enter the password you chose in your `docker-compose.yml` file.
+
+# Update to a newer version
+Updating the Nextcloud container is done by pulling the new image, throwing away the old container and starting the new one.
+
+**It is only possible to upgrade one major version at a time. For example, if you want to upgrade from version 14 to 16, you will have to upgrade from version 14 to 15, then from 15 to 16.**
+
+Since all data is stored in volumes, nothing gets lost. The startup script will check for the version in your volume and the installed docker version. If it finds a mismatch, it automatically starts the upgrade process. Don't forget to add all the volumes to your new container, so it works as expected.
+
+```console
+$ docker pull nextcloud
+$ docker stop
+$ docker rm
+$ docker run -d nextcloud
+```
+Beware that you have to run the same command with the options that you used to initially start your Nextcloud. That includes volumes, port mapping.
+
+When using docker-compose your compose file takes care of your configuration, so you just have to run:
+
+```console
+$ docker-compose pull
+$ docker-compose up -d
+```
+
+
+# Adding Features
+A lot of people want to use additional functionality inside their Nextcloud installation. If the image does not include the packages you need, you can easily build your own image on top of it.
+Start your derived image with the `FROM` statement and add whatever you like.
+
+```yaml
+FROM nextcloud:apache
+
+RUN ...
+
+```
+The [examples folder](https://github.com/nextcloud/docker/blob/master/.examples) gives a few examples on how to add certain functionalities, like including the cron job, smb-support or imap-authentication.
+
+If you use your own Dockerfile, you need to configure your docker-compose file accordingly. Switch out the `image` option with `build`. You have to specify the path to your Dockerfile. (in the example it's in the same directory next to the docker-compose file)
+
+```yaml
+ app:
+ build: .
+ links:
+ - db
+ volumes:
+ - data:/var/www/html/data
+ - config:/var/www/html/config
+ - apps:/var/www/html/apps
+ restart: always
+```
+
+If you intend to use another command to run the image, make sure that you set `NEXTCLOUD_UPDATE=1` in your Dockerfile. Otherwise the installation and update will not work.
+
+```yaml
+FROM nextcloud:apache
+
+...
+
+ENV NEXTCLOUD_UPDATE=1
+
+CMD ["/usr/bin/supervisord"]
+```
+
+
+**Updating** your own derived image is also very simple. When a new version of the Nextcloud image is available run:
+
+```console
+docker build -t your-name --pull .
+docker run -d your-name
+```
+
+or for docker-compose:
+```console
+docker-compose build --pull
+docker-compose up -d
+```
+
+The `--pull` option tells docker to look for new versions of the base image. Then the build instructions inside your `Dockerfile` are run on top of the new image.
+
+# Migrating an existing installation
+You're already using Nextcloud and want to switch to docker? Great! Here are some things to look out for:
+
+1. Define your whole Nextcloud infrastructure in a `docker-compose` file and run it with `docker-compose up -d` to get the base installation, volumes and database. Work from there.
+2. Restore your database from a mysqldump (nextcloud\_db\_1 is the name of your db container)
+ - To import from a MySQL dump use the following commands
+ ```console
+ docker cp ./database.dmp nextcloud_db_1:/dmp
+ docker-compose exec db sh -c "mysql -u USER -pPASSWORD nextcloud < /dmp"
+ docker-compose exec db rm /dmp
+ ```
+ - To import from a PostgreSQL dump use to following commands
+ ```console
+ docker cp ./database.dmp nextcloud_db_1:/dmp
+ docker-compose exec db sh -c "psql -U USER --set ON_ERROR_STOP=on nextcloud < /dmp"
+ docker-compose exec db rm /dmp
+ ```
+3. Edit your config.php
+ 1. Set database connection
+ - In case of MySQL database
+ ```php
+ 'dbhost' => 'db:3306',
+ ```
+ - In case of PostgreSQL database
+ ```php
+ 'dbhost' => 'db:5432',
+ ```
+ 2. Make sure you have no configuration for the `apps_paths`. Delete lines like these
+ ```diff
+ - "apps_paths" => array (
+ - 0 => array (
+ - "path" => OC::$SERVERROOT."/apps",
+ - "url" => "/apps",
+ - "writable" => true,
+ - ),
+ ```
+ 3. Make sure to have the `apps` directory non writable and the `custom_apps` directory writable
+ ```php
+ 'apps_paths' => array (
+ 0 => array (
+ 'path' => '/var/www/html/apps',
+ 'url' => '/apps',
+ 'writable' => false,
+ ),
+ 1 => array (
+ 'path' => '/var/www/html/custom_apps',
+ 'url' => '/custom_apps',
+ 'writable' => true,
+ ),
+ ),
+ ```
+ 4. Make sure your data directory is set to /var/www/html/data
+ ```php
+ 'datadirectory' => '/var/www/html/data',
+ ```
+
+
+4. Copy your data (nextcloud_app_1 is the name of your Nextcloud container):
+```console
+docker cp ./data/ nextcloud_app_1:/var/www/html/
+docker-compose exec app chown -R www-data:www-data /var/www/html/data
+docker cp ./theming/ nextcloud_app_1:/var/www/html/
+docker-compose exec app chown -R www-data:www-data /var/www/html/theming
+docker cp ./config/config.php nextcloud_app_1:/var/www/html/config
+docker-compose exec app chown -R www-data:www-data /var/www/html/config
+```
+5. Copy only the custom apps you use (or simply redownload them from the web interface):
+```console
+docker cp ./custom_apps/ nextcloud_data:/var/www/html/
+docker-compose exec app chown -R www-data:www-data /var/www/html/custom_apps
+```
+
+# Questions / Issues
+If you got any questions or problems using the image, please visit our [Github Repository](https://github.com/nextcloud/docker) and write an issue.
diff --git a/linux/advanced/nextcloud/pure/15/docker-compose.yml b/linux/advanced/nextcloud/pure/15/docker-compose.yml
new file mode 100644
index 000000000..d3e497a0f
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/15/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+ app:
+ image: "epicmorg/nextcloud:15"
+ build:
+ context: .
diff --git a/linux/nextcloud/15/smb.conf b/linux/advanced/nextcloud/pure/15/smb.conf
similarity index 100%
rename from linux/nextcloud/15/smb.conf
rename to linux/advanced/nextcloud/pure/15/smb.conf
diff --git a/linux/advanced/nextcloud/pure/15/sources.list b/linux/advanced/nextcloud/pure/15/sources.list
new file mode 100644
index 000000000..5a8c0081a
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/15/sources.list
@@ -0,0 +1,21 @@
+#main
+deb http://httpredir.debian.org/debian/ bullseye main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye main contrib non-free
+deb http://httpredir.debian.org/debian/ bullseye-updates main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye-updates main contrib non-free
+deb http://httpredir.debian.org/debian/ bullseye-backports main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye-backports main contrib non-free
+deb http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib non-free
+
+#security
+deb http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free
+deb-src http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free
+deb http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free
+deb-src http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free
+
+##multimedia
+# deb http://httpredir.debian.org/debian-multimedia/ bullseye main non-free
+# deb-src http://httpredir.debian.org/debian-multimedia/ bullseye main non-free
+# deb http://httpredir.debian.org/debian-multimedia/ bullseye-backports main
+# deb-src http://httpredir.debian.org/debian-multimedia/ bullseye-backports main
diff --git a/linux/advanced/nextcloud/pure/16/Dockerfile b/linux/advanced/nextcloud/pure/16/Dockerfile
new file mode 100644
index 000000000..b96e667f2
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/16/Dockerfile
@@ -0,0 +1,68 @@
+FROM nextcloud:16
+ENV DEBIAN_FRONTEND noninteractive
+
+##################################################################
+# adding normal sources list
+##################################################################
+RUN rm /etc/apt/sources.list
+COPY sources.list /etc/apt/sources.list
+
+##################################################################
+# adding some utils
+##################################################################
+RUN apt update -y && \
+ apt dist-upgrade -y && \
+ apt install -y --allow-unauthenticated \
+ apt-transport-https \
+ curl \
+ ca-certificates \
+ ghostscript \
+ nload \
+ htop \
+ mc \
+ nano \
+ sudo \
+ imagemagick \
+ imagemagick-common \
+ sqlite3 \
+ smbclient \
+ libsmbclient \
+ wget \
+ net-tools \
+ iputils-ping
+
+
+##################################################################
+# installing php repo + smbclient
+##################################################################
+RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
+RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list'
+RUN apt update -y && \
+ apt install -y --allow-unauthenticated \
+ libsmbclient-dev \
+ libmagickwand-dev \
+ libmagickcore-dev \
+ libc-client-dev \
+ libkrb5-dev \
+ libsqlite3-dev \
+ libssl-dev
+
+RUN pecl install inotify && \
+ docker-php-ext-enable inotify
+
+RUN pecl install smbclient && \
+ docker-php-ext-enable smbclient
+
+RUN docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
+ docker-php-ext-install imap && \
+ docker-php-ext-enable imap
+
+RUN docker-php-ext-install fileinfo bz2 intl ftp pdo_sqlite && \
+ docker-php-ext-enable fileinfo bz2 intl ftp pdo_sqlite
+
+##################################################################
+# smb fix
+##################################################################
+RUN rm -frv /etc/samba/smb.conf /usr/share/samba/smb.conf
+ADD smb.conf /etc/samba/
+ADD smb.conf /usr/share/samba/
diff --git a/linux/advanced/nextcloud/pure/16/Makefile b/linux/advanced/nextcloud/pure/16/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/16/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+ make build
+ make deploy
+ make clean
+
+build:
+ docker-compose build --compress --parallel
+
+deploy:
+ docker-compose push
+
+clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
diff --git a/linux/advanced/nextcloud/pure/16/README.md b/linux/advanced/nextcloud/pure/16/README.md
new file mode 100644
index 000000000..b6df71808
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/16/README.md
@@ -0,0 +1,527 @@
+# What is Nextcloud?
+
+[](https://github.com/nextcloud/docker/actions?query=workflow%3AImages)
+[](https://github.com/nextcloud/docker/actions?query=workflow%3Aupdate.sh)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/i386/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/mips64le/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/s390x/job/nextcloud)
+
+A safe home for all your data. Access & share your files, calendars, contacts, mail & more from any device, on your terms.
+
+
+
+# How to use this image
+This image is designed to be used in a micro-service environment. There are two versions of the image you can choose from.
+
+The `apache` tag contains a full Nextcloud installation including an apache web server. It is designed to be easy to use and gets you running pretty fast. This is also the default for the `latest` tag and version tags that are not further specified.
+
+The second option is a `fpm` container. It is based on the [php-fpm](https://hub.docker.com/_/php/) image and runs a fastCGI-Process that serves your Nextcloud page. To use this image it must be combined with any webserver that can proxy the http requests to the FastCGI-port of the container.
+
+[](http://play-with-docker.com?stack=https://raw.githubusercontent.com/nextcloud/docker/8db861d67f257a3e9ac1790ea06d4e2a7a193a6c/stack.yml)
+
+## Using the apache image
+The apache image contains a webserver and exposes port 80. To start the container type:
+
+```console
+$ docker run -d -p 8080:80 nextcloud
+```
+
+Now you can access Nextcloud at http://localhost:8080/ from your host system.
+
+
+## Using the fpm image
+To use the fpm image, you need an additional web server that can proxy http-request to the fpm-port of the container. For fpm connection this container exposes port 9000. In most cases, you might want use another container or your host as proxy.
+If you use your host you can address your Nextcloud container directly on port 9000. If you use another container, make sure that you add them to the same docker network (via `docker run --network ...` or a `docker-compose` file).
+In both cases you don't want to map the fpm port to your host.
+
+```console
+$ docker run -d nextcloud:fpm
+```
+
+As the fastCGI-Process is not capable of serving static files (style sheets, images, ...), the webserver needs access to these files. This can be achieved with the `volumes-from` option. You can find more information in the [docker-compose section](#running-this-image-with-docker-compose).
+
+## Using an external database
+By default, this container uses SQLite for data storage but the Nextcloud setup wizard (appears on first run) allows connecting to an existing MySQL/MariaDB or PostgreSQL database. You can also link a database container, e. g. `--link my-mysql:mysql`, and then use `mysql` as the database host on setup. More info is in the docker-compose section.
+
+## Persistent data
+The Nextcloud installation and all data beyond what lives in the database (file uploads, etc) are stored in the [unnamed docker volume](https://docs.docker.com/engine/tutorials/dockervolumes/#adding-a-data-volume) volume `/var/www/html`. The docker daemon will store that data within the docker directory `/var/lib/docker/volumes/...`. That means your data is saved even if the container crashes, is stopped or deleted.
+
+A named Docker volume or a mounted host directory should be used for upgrades and backups. To achieve this, you need one volume for your database container and one for Nextcloud.
+
+Nextcloud:
+- `/var/www/html/` folder where all nextcloud data lives
+```console
+$ docker run -d \
+-v nextcloud:/var/www/html \
+nextcloud
+```
+
+Database:
+- `/var/lib/mysql` MySQL / MariaDB Data
+- `/var/lib/postgresql/data` PostgreSQL Data
+```console
+$ docker run -d \
+-v db:/var/lib/mysql \
+mariadb
+```
+
+If you want to get fine grained access to your individual files, you can mount additional volumes for data, config, your theme and custom apps.
+The `data`, `config` files are stored in respective subfolders inside `/var/www/html/`. The apps are split into core `apps` (which are shipped with Nextcloud and you don't need to take care of) and a `custom_apps` folder. If you use a custom theme it would go into the `themes` subfolder.
+
+Overview of the folders that can be mounted as volumes:
+
+- `/var/www/html` Main folder, needed for updating
+- `/var/www/html/custom_apps` installed / modified apps
+- `/var/www/html/config` local configuration
+- `/var/www/html/data` the actual data of your Nextcloud
+- `/var/www/html/themes/` theming/branding
+
+If you want to use named volumes for all of these, it would look like this:
+```console
+$ docker run -d \
+-v nextcloud:/var/www/html \
+-v apps:/var/www/html/custom_apps \
+-v config:/var/www/html/config \
+-v data:/var/www/html/data \
+-v theme:/var/www/html/themes/ \
+nextcloud
+```
+
+## Using the Nextcloud command-line interface
+To use the [Nextcloud command-line interface](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/occ_command.html) (aka. `occ` command):
+```console
+$ docker exec --user www-data CONTAINER_ID php occ
+```
+or for docker-compose:
+```console
+$ docker-compose exec --user www-data app php occ
+```
+
+## Auto configuration via environment variables
+The nextcloud image supports auto configuration via environment variables. You can preconfigure everything that is asked on the install page on first run. To enable auto configuration, set your database connection via the following environment variables. ONLY use one database type!
+
+__SQLite__:
+- `SQLITE_DATABASE` Name of the database using sqlite
+
+__MYSQL/MariaDB__:
+- `MYSQL_DATABASE` Name of the database using mysql / mariadb.
+- `MYSQL_USER` Username for the database using mysql / mariadb.
+- `MYSQL_PASSWORD` Password for the database user using mysql / mariadb.
+- `MYSQL_HOST` Hostname of the database server using mysql / mariadb.
+
+__PostgreSQL__:
+- `POSTGRES_DB` Name of the database using postgres.
+- `POSTGRES_USER` Username for the database using postgres.
+- `POSTGRES_PASSWORD` Password for the database user using postgres.
+- `POSTGRES_HOST` Hostname of the database server using postgres.
+
+If you set any values, they will not be asked in the install page on first run. With a complete configuration by using all variables for your database type, you can additionally configure your Nextcloud instance by setting admin user and password (only works if you set both):
+
+- `NEXTCLOUD_ADMIN_USER` Name of the Nextcloud admin user.
+- `NEXTCLOUD_ADMIN_PASSWORD` Password for the Nextcloud admin user.
+
+If you want, you can set the data directory, otherwise default value will be used.
+
+- `NEXTCLOUD_DATA_DIR` (default: _/var/www/html/data_) Configures the data directory where nextcloud stores all files from the users.
+
+One or more trusted domains can be set through environment variable, too. They will be added to the configuration after install.
+
+- `NEXTCLOUD_TRUSTED_DOMAINS` (not set by default) Optional space-separated list of domains
+
+The install and update script is only triggered when a default command is used (`apache-foreground` or `php-fpm`). If you use a custom command you have to enable the install / update with
+
+- `NEXTCLOUD_UPDATE` (default: _0_)
+
+If you want to use Redis you have to create a separate [Redis](https://hub.docker.com/_/redis/) container in your setup / in your docker-compose file. To inform Nextcloud about the Redis container, pass in the following parameters:
+
+- `REDIS_HOST` (not set by default) Name of Redis container
+- `REDIS_HOST_PORT` (default: _6379_) Optional port for Redis, only use for external Redis servers that run on non-standard ports.
+- `REDIS_HOST_PASSWORD` (not set by default) Redis password
+
+The use of Redis is recommended to prevent file locking problems. See the examples for further instructions.
+
+To use an external SMTP server, you have to provide the connection details. To configure Nextcloud to use SMTP add:
+
+- `SMTP_HOST` (not set by default): The hostname of the SMTP server.
+- `SMTP_SECURE` (empty by default): Set to `ssl` to use SSL, or `tls` to use STARTTLS.
+- `SMTP_PORT` (default: `465` for SSL and `25` for non-secure connections): Optional port for the SMTP connection. Use `587` for an alternative port for STARTTLS.
+- `SMTP_AUTHTYPE` (default: `LOGIN`): The method used for authentication. Use `PLAIN` if no authentication is required.
+- `SMTP_NAME` (empty by default): The username for the authentication.
+- `SMTP_PASSWORD` (empty by default): The password for the authentication.
+- `MAIL_FROM_ADDRESS` (not set by default): Use this address for the 'from' field in the emails sent by Nextcloud.
+- `MAIL_DOMAIN` (not set by default): Set a different domain for the emails than the domain where Nextcloud is installed.
+
+Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/email_configuration.html) for other values to configure SMTP.
+
+To use an external S3 compatible object store as primary storage, set the following variables:
+- `OBJECTSTORE_S3_HOST`: The hostname of the object storage server
+- `OBJECTSTORE_S3_BUCKET`: The name of the bucket that Nextcloud should store the data in
+- `OBJECTSTORE_S3_KEY`: AWS style access key
+- `OBJECTSTORE_S3_SECRET`: AWS style secret access key
+- `OBJECTSTORE_S3_PORT`: The port that the object storage server is being served over
+- `OBJECTSTORE_S3_SSL` (default: `true`): Whether or not SSL/TLS should be used to communicate with object storage server
+- `OBJECTSTORE_S3_REGION`: The region that the S3 bucket resides in.
+- `OBJECTSTORE_S3_USEPATH_STYLE` (default: `false`): Not required for AWS S3
+
+Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/primary_storage.html#simple-storage-service-s3) for more information.
+
+To use an external OpenStack Swift object store as primary storage, set the following variables:
+- `OBJECTSTORE_SWIFT_URL`: The Swift identity (Keystone) endpoint
+- `OBJECTSTORE_SWIFT_AUTOCREATE` (default: `false`): Whether or not Nextcloud should automatically create the Swift container
+- `OBJECTSTORE_SWIFT_USER_NAME`: Swift username
+- `OBJECTSTORE_SWIFT_USER_PASSWORD`: Swift user password
+- `OBJECTSTORE_SWIFT_USER_DOMAIN` (default: `Default`): Swift user domain
+- `OBJECTSTORE_SWIFT_PROJECT_NAME`: OpenStack project name
+- `OBJECTSTORE_SWIFT_PROJECT_DOMAIN` (default: `Default`): OpenStack project domain
+- `OBJECTSTORE_SWIFT_SERVICE_NAME` (default: `swift`): Swift service name
+- `OBJECTSTORE_SWIFT_SERVICE_REGION`: Swift endpoint region
+- `OBJECTSTORE_SWIFT_CONTAINER_NAME`: Swift container (bucket) that Nextcloud should store the data in
+
+Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/primary_storage.html#openstack-swift) for more information.
+
+
+## Using the apache image behind a reverse proxy and auto configure server host and protocol
+
+The apache image will replace the remote addr (ip address visible to Nextcloud) with the ip address from `X-Real-IP` if the request is coming from a proxy in 10.0.0.0/8, 172.16.0.0/12 or 192.168.0.0/16 by default. If you want Nextcloud to pick up the server host (`HTTP_X_FORWARDED_HOST`), protocol (`HTTP_X_FORWARDED_PROTO`) and client ip (`HTTP_X_FORWARDED_FOR`) from a trusted proxy disable rewrite ip and the reverse proxies ip address to `TRUSTED_PROXIES`.
+
+- `APACHE_DISABLE_REWRITE_IP` (not set by default): Set to 1 to disable rewrite ip.
+
+- `TRUSTED_PROXIES` (empty by default): A space-separated list of trusted proxies. CIDR notation is supported for IPv4.
+
+If the `TRUSTED_PROXIES` approach does not work for you, try using fixed values for overwrite parameters.
+
+- `OVERWRITEHOST` (empty by default): Set the hostname of the proxy. Can also specify a port.
+- `OVERWRITEPROTOCOL` (empty by default): Set the protocol of the proxy, http or https.
+- `OVERWRITEWEBROOT` (empty by default): Set the absolute path of the proxy.
+- `OVERWRITECONDADDR` (empty by default): Regex to overwrite the values dependent on the remote address.
+
+Check the [Nexcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/reverse_proxy_configuration.html) for more details.
+
+Keep in mind that once set, removing these environment variables won't remove these values from the configuration file, due to how Nextcloud merges configuration files together.
+
+# Running this image with docker-compose
+The easiest way to get a fully featured and functional setup is using a `docker-compose` file. There are too many different possibilities to setup your system, so here are only some examples of what you have to look for.
+
+At first, make sure you have chosen the right base image (fpm or apache) and added features you wanted (see below). In every case, you would want to add a database container and docker volumes to get easy access to your persistent data. When you want to have your server reachable from the internet, adding HTTPS-encryption is mandatory! See below for more information.
+
+## Base version - apache
+This version will use the apache image and add a mariaDB container. The volumes are set to keep your data persistent. This setup provides **no ssl encryption** and is intended to run behind a proxy.
+
+Make sure to pass in values for `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` variables before you run this setup.
+
+```yaml
+version: '2'
+
+volumes:
+ nextcloud:
+ db:
+
+services:
+ db:
+ image: mariadb
+ command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+ restart: always
+ volumes:
+ - db:/var/lib/mysql
+ environment:
+ - MYSQL_ROOT_PASSWORD=
+ - MYSQL_PASSWORD=
+ - MYSQL_DATABASE=nextcloud
+ - MYSQL_USER=nextcloud
+
+ app:
+ image: nextcloud
+ ports:
+ - 8080:80
+ links:
+ - db
+ volumes:
+ - nextcloud:/var/www/html
+ restart: always
+
+```
+
+Then run `docker-compose up -d`, now you can access Nextcloud at http://localhost:8080/ from your host system.
+
+## Base version - FPM
+When using the FPM image, you need another container that acts as web server on port 80 and proxies the requests to the Nextcloud container. In this example a simple nginx container is combined with the Nextcloud-fpm image and a MariaDB database container. The data is stored in docker volumes. The nginx container also needs access to static files from your Nextcloud installation. It gets access to all the volumes mounted to Nextcloud via the `volumes_from` option.The configuration for nginx is stored in the configuration file `nginx.conf`, that is mounted into the container. An example can be found in the examples section [here](https://github.com/nextcloud/docker/tree/master/.examples).
+
+As this setup does **not include encryption**, it should be run behind a proxy.
+
+Make sure to pass in values for `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` variables before you run this setup.
+
+```yaml
+version: '2'
+
+volumes:
+ nextcloud:
+ db:
+
+services:
+ db:
+ image: mariadb
+ command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+ restart: always
+ volumes:
+ - db:/var/lib/mysql
+ environment:
+ - MYSQL_ROOT_PASSWORD=
+ - MYSQL_PASSWORD=
+ - MYSQL_DATABASE=nextcloud
+ - MYSQL_USER=nextcloud
+
+ app:
+ image: nextcloud:fpm
+ links:
+ - db
+ volumes:
+ - nextcloud:/var/www/html
+ restart: always
+
+ web:
+ image: nginx
+ ports:
+ - 8080:80
+ links:
+ - app
+ volumes:
+ - ./nginx.conf:/etc/nginx/nginx.conf:ro
+ volumes_from:
+ - app
+ restart: always
+```
+
+Then run `docker-compose up -d`, now you can access Nextcloud at http://localhost:8080/ from your host system.
+
+# Docker Secrets
+As an alternative to passing sensitive information via environment variables, _FILE may be appended to the previously listed environment variables, causing the initialization script to load the values for those variables from files present in the container. In particular, this can be used to load passwords from Docker secrets stored in /run/secrets/ files. For example:
+```yaml
+version: '3.2'
+
+services:
+ db:
+ image: postgres
+ restart: always
+ volumes:
+ - db:/var/lib/postgresql/data
+ environment:
+ - POSTGRES_DB_FILE=/run/secrets/postgres_db
+ - POSTGRES_USER_FILE=/run/secrets/postgres_user
+ - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
+ secrets:
+ - postgres_db
+ - postgres_password
+ - postgres_user
+
+ app:
+ image: nextcloud
+ restart: always
+ ports:
+ - 8080:80
+ volumes:
+ - nextcloud:/var/www/html
+ environment:
+ - POSTGRES_HOST=db
+ - POSTGRES_DB_FILE=/run/secrets/postgres_db
+ - POSTGRES_USER_FILE=/run/secrets/postgres_user
+ - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
+ - NEXTCLOUD_ADMIN_PASSWORD_FILE=/run/secrets/nextcloud_admin_password
+ - NEXTCLOUD_ADMIN_USER_FILE=/run/secrets/nextcloud_admin_user
+ depends_on:
+ - db
+ secrets:
+ - nextcloud_admin_password
+ - nextcloud_admin_user
+ - postgres_db
+ - postgres_password
+ - postgres_user
+
+volumes:
+ db:
+ nextcloud:
+
+secrets:
+ nextcloud_admin_password:
+ file: ./nextcloud_admin_password.txt # put admin password to this file
+ nextcloud_admin_user:
+ file: ./nextcloud_admin_user.txt # put admin username to this file
+ postgres_db:
+ file: ./postgres_db.txt # put postgresql db name to this file
+ postgres_password:
+ file: ./postgres_password.txt # put postgresql password to this file
+ postgres_user:
+ file: ./postgres_user.txt # put postgresql username to this file
+```
+
+Currently, this is only supported for `NEXTCLOUD_ADMIN_PASSWORD`, `NEXTCLOUD_ADMIN_USER`, `MYSQL_DB`, `MYSQL_PASSWORD`, `MYSQL_USER`, `POSTGRES_DB`, `POSTGRES_PASSWORD`, `POSTGRES_USER`.
+
+# Make your Nextcloud available from the internet
+Until here, your Nextcloud is just available from you docker host. If you want your Nextcloud available from the internet adding SSL encryption is mandatory.
+
+## HTTPS - SSL encryption
+There are many different possibilities to introduce encryption depending on your setup.
+
+We recommend using a reverse proxy in front of our Nextcloud installation. Your Nextcloud will only be reachable through the proxy, which encrypts all traffic to the clients. You can mount your manually generated certificates to the proxy or use a fully automated solution which generates and renews the certificates for you.
+
+In our [examples](https://github.com/nextcloud/docker/tree/master/.examples) section we have an example for a fully automated setup using a reverse proxy, a container for [Let's Encrypt](https://letsencrypt.org/) certificate handling, database and Nextcloud. It uses the popular [nginx-proxy](https://github.com/jwilder/nginx-proxy) and [docker-letsencrypt-nginx-proxy-companion](https://github.com/JrCs/docker-letsencrypt-nginx-proxy-companion) containers. Please check the according documentations before using this setup.
+
+# First use
+When you first access your Nextcloud, the setup wizard will appear and ask you to choose an administrator account username, password and the database connection. For the database use `db` as host and `nextcloud` as table and user name. Also enter the password you chose in your `docker-compose.yml` file.
+
+# Update to a newer version
+Updating the Nextcloud container is done by pulling the new image, throwing away the old container and starting the new one.
+
+**It is only possible to upgrade one major version at a time. For example, if you want to upgrade from version 14 to 16, you will have to upgrade from version 14 to 15, then from 15 to 16.**
+
+Since all data is stored in volumes, nothing gets lost. The startup script will check for the version in your volume and the installed docker version. If it finds a mismatch, it automatically starts the upgrade process. Don't forget to add all the volumes to your new container, so it works as expected.
+
+```console
+$ docker pull nextcloud
+$ docker stop
+$ docker rm
+$ docker run -d nextcloud
+```
+Beware that you have to run the same command with the options that you used to initially start your Nextcloud. That includes volumes, port mapping.
+
+When using docker-compose your compose file takes care of your configuration, so you just have to run:
+
+```console
+$ docker-compose pull
+$ docker-compose up -d
+```
+
+
+# Adding Features
+A lot of people want to use additional functionality inside their Nextcloud installation. If the image does not include the packages you need, you can easily build your own image on top of it.
+Start your derived image with the `FROM` statement and add whatever you like.
+
+```yaml
+FROM nextcloud:apache
+
+RUN ...
+
+```
+The [examples folder](https://github.com/nextcloud/docker/blob/master/.examples) gives a few examples on how to add certain functionalities, like including the cron job, smb-support or imap-authentication.
+
+If you use your own Dockerfile, you need to configure your docker-compose file accordingly. Switch out the `image` option with `build`. You have to specify the path to your Dockerfile. (in the example it's in the same directory next to the docker-compose file)
+
+```yaml
+ app:
+ build: .
+ links:
+ - db
+ volumes:
+ - data:/var/www/html/data
+ - config:/var/www/html/config
+ - apps:/var/www/html/apps
+ restart: always
+```
+
+If you intend to use another command to run the image, make sure that you set `NEXTCLOUD_UPDATE=1` in your Dockerfile. Otherwise the installation and update will not work.
+
+```yaml
+FROM nextcloud:apache
+
+...
+
+ENV NEXTCLOUD_UPDATE=1
+
+CMD ["/usr/bin/supervisord"]
+```
+
+
+**Updating** your own derived image is also very simple. When a new version of the Nextcloud image is available run:
+
+```console
+docker build -t your-name --pull .
+docker run -d your-name
+```
+
+or for docker-compose:
+```console
+docker-compose build --pull
+docker-compose up -d
+```
+
+The `--pull` option tells docker to look for new versions of the base image. Then the build instructions inside your `Dockerfile` are run on top of the new image.
+
+# Migrating an existing installation
+You're already using Nextcloud and want to switch to docker? Great! Here are some things to look out for:
+
+1. Define your whole Nextcloud infrastructure in a `docker-compose` file and run it with `docker-compose up -d` to get the base installation, volumes and database. Work from there.
+2. Restore your database from a mysqldump (nextcloud\_db\_1 is the name of your db container)
+ - To import from a MySQL dump use the following commands
+ ```console
+ docker cp ./database.dmp nextcloud_db_1:/dmp
+ docker-compose exec db sh -c "mysql -u USER -pPASSWORD nextcloud < /dmp"
+ docker-compose exec db rm /dmp
+ ```
+ - To import from a PostgreSQL dump use to following commands
+ ```console
+ docker cp ./database.dmp nextcloud_db_1:/dmp
+ docker-compose exec db sh -c "psql -U USER --set ON_ERROR_STOP=on nextcloud < /dmp"
+ docker-compose exec db rm /dmp
+ ```
+3. Edit your config.php
+ 1. Set database connection
+ - In case of MySQL database
+ ```php
+ 'dbhost' => 'db:3306',
+ ```
+ - In case of PostgreSQL database
+ ```php
+ 'dbhost' => 'db:5432',
+ ```
+ 2. Make sure you have no configuration for the `apps_paths`. Delete lines like these
+ ```diff
+ - "apps_paths" => array (
+ - 0 => array (
+ - "path" => OC::$SERVERROOT."/apps",
+ - "url" => "/apps",
+ - "writable" => true,
+ - ),
+ ```
+ 3. Make sure to have the `apps` directory non writable and the `custom_apps` directory writable
+ ```php
+ 'apps_paths' => array (
+ 0 => array (
+ 'path' => '/var/www/html/apps',
+ 'url' => '/apps',
+ 'writable' => false,
+ ),
+ 1 => array (
+ 'path' => '/var/www/html/custom_apps',
+ 'url' => '/custom_apps',
+ 'writable' => true,
+ ),
+ ),
+ ```
+ 4. Make sure your data directory is set to /var/www/html/data
+ ```php
+ 'datadirectory' => '/var/www/html/data',
+ ```
+
+
+4. Copy your data (nextcloud_app_1 is the name of your Nextcloud container):
+```console
+docker cp ./data/ nextcloud_app_1:/var/www/html/
+docker-compose exec app chown -R www-data:www-data /var/www/html/data
+docker cp ./theming/ nextcloud_app_1:/var/www/html/
+docker-compose exec app chown -R www-data:www-data /var/www/html/theming
+docker cp ./config/config.php nextcloud_app_1:/var/www/html/config
+docker-compose exec app chown -R www-data:www-data /var/www/html/config
+```
+5. Copy only the custom apps you use (or simply redownload them from the web interface):
+```console
+docker cp ./custom_apps/ nextcloud_data:/var/www/html/
+docker-compose exec app chown -R www-data:www-data /var/www/html/custom_apps
+```
+
+# Questions / Issues
+If you got any questions or problems using the image, please visit our [Github Repository](https://github.com/nextcloud/docker) and write an issue.
diff --git a/linux/advanced/nextcloud/pure/16/docker-compose.yml b/linux/advanced/nextcloud/pure/16/docker-compose.yml
new file mode 100644
index 000000000..b62a895ea
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/16/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+ app:
+ image: "epicmorg/nextcloud:16"
+ build:
+ context: .
diff --git a/linux/nextcloud/16/smb.conf b/linux/advanced/nextcloud/pure/16/smb.conf
similarity index 100%
rename from linux/nextcloud/16/smb.conf
rename to linux/advanced/nextcloud/pure/16/smb.conf
diff --git a/linux/advanced/nextcloud/pure/16/sources.list b/linux/advanced/nextcloud/pure/16/sources.list
new file mode 100644
index 000000000..5a8c0081a
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/16/sources.list
@@ -0,0 +1,21 @@
+#main
+deb http://httpredir.debian.org/debian/ bullseye main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye main contrib non-free
+deb http://httpredir.debian.org/debian/ bullseye-updates main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye-updates main contrib non-free
+deb http://httpredir.debian.org/debian/ bullseye-backports main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye-backports main contrib non-free
+deb http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib non-free
+
+#security
+deb http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free
+deb-src http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free
+deb http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free
+deb-src http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free
+
+##multimedia
+# deb http://httpredir.debian.org/debian-multimedia/ bullseye main non-free
+# deb-src http://httpredir.debian.org/debian-multimedia/ bullseye main non-free
+# deb http://httpredir.debian.org/debian-multimedia/ bullseye-backports main
+# deb-src http://httpredir.debian.org/debian-multimedia/ bullseye-backports main
diff --git a/linux/advanced/nextcloud/pure/17/Dockerfile b/linux/advanced/nextcloud/pure/17/Dockerfile
new file mode 100644
index 000000000..05fb0013c
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/17/Dockerfile
@@ -0,0 +1,68 @@
+FROM nextcloud:17
+ENV DEBIAN_FRONTEND noninteractive
+
+##################################################################
+# adding normal sources list
+##################################################################
+RUN rm /etc/apt/sources.list
+COPY sources.list /etc/apt/sources.list
+
+##################################################################
+# adding some utils
+##################################################################
+RUN apt update -y && \
+ apt dist-upgrade -y && \
+ apt install -y --allow-unauthenticated \
+ apt-transport-https \
+ curl \
+ ca-certificates \
+ ghostscript \
+ nload \
+ htop \
+ mc \
+ nano \
+ sudo \
+ imagemagick \
+ imagemagick-common \
+ sqlite3 \
+ smbclient \
+ libsmbclient \
+ wget \
+ net-tools \
+ iputils-ping
+
+
+##################################################################
+# installing php repo + smbclient
+##################################################################
+RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
+RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list'
+RUN apt update -y && \
+ apt install -y --allow-unauthenticated \
+ libsmbclient-dev \
+ libmagickwand-dev \
+ libmagickcore-dev \
+ libc-client-dev \
+ libkrb5-dev \
+ libsqlite3-dev \
+ libssl-dev
+
+RUN pecl install inotify && \
+ docker-php-ext-enable inotify
+
+RUN pecl install smbclient && \
+ docker-php-ext-enable smbclient
+
+RUN docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
+ docker-php-ext-install imap && \
+ docker-php-ext-enable imap
+
+RUN docker-php-ext-install fileinfo bz2 intl ftp pdo_sqlite && \
+ docker-php-ext-enable fileinfo bz2 intl ftp pdo_sqlite
+
+##################################################################
+# smb fix
+##################################################################
+RUN rm -frv /etc/samba/smb.conf /usr/share/samba/smb.conf
+ADD smb.conf /etc/samba/
+ADD smb.conf /usr/share/samba/
diff --git a/linux/advanced/nextcloud/pure/17/Makefile b/linux/advanced/nextcloud/pure/17/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/17/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+ make build
+ make deploy
+ make clean
+
+build:
+ docker-compose build --compress --parallel
+
+deploy:
+ docker-compose push
+
+clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
diff --git a/linux/advanced/nextcloud/pure/17/README.md b/linux/advanced/nextcloud/pure/17/README.md
new file mode 100644
index 000000000..b6df71808
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/17/README.md
@@ -0,0 +1,527 @@
+# What is Nextcloud?
+
+[](https://github.com/nextcloud/docker/actions?query=workflow%3AImages)
+[](https://github.com/nextcloud/docker/actions?query=workflow%3Aupdate.sh)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/i386/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/mips64le/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/s390x/job/nextcloud)
+
+A safe home for all your data. Access & share your files, calendars, contacts, mail & more from any device, on your terms.
+
+
+
+# How to use this image
+This image is designed to be used in a micro-service environment. There are two versions of the image you can choose from.
+
+The `apache` tag contains a full Nextcloud installation including an apache web server. It is designed to be easy to use and gets you running pretty fast. This is also the default for the `latest` tag and version tags that are not further specified.
+
+The second option is a `fpm` container. It is based on the [php-fpm](https://hub.docker.com/_/php/) image and runs a fastCGI-Process that serves your Nextcloud page. To use this image it must be combined with any webserver that can proxy the http requests to the FastCGI-port of the container.
+
+[](http://play-with-docker.com?stack=https://raw.githubusercontent.com/nextcloud/docker/8db861d67f257a3e9ac1790ea06d4e2a7a193a6c/stack.yml)
+
+## Using the apache image
+The apache image contains a webserver and exposes port 80. To start the container type:
+
+```console
+$ docker run -d -p 8080:80 nextcloud
+```
+
+Now you can access Nextcloud at http://localhost:8080/ from your host system.
+
+
+## Using the fpm image
+To use the fpm image, you need an additional web server that can proxy http-request to the fpm-port of the container. For fpm connection this container exposes port 9000. In most cases, you might want use another container or your host as proxy.
+If you use your host you can address your Nextcloud container directly on port 9000. If you use another container, make sure that you add them to the same docker network (via `docker run --network ...` or a `docker-compose` file).
+In both cases you don't want to map the fpm port to your host.
+
+```console
+$ docker run -d nextcloud:fpm
+```
+
+As the fastCGI-Process is not capable of serving static files (style sheets, images, ...), the webserver needs access to these files. This can be achieved with the `volumes-from` option. You can find more information in the [docker-compose section](#running-this-image-with-docker-compose).
+
+## Using an external database
+By default, this container uses SQLite for data storage but the Nextcloud setup wizard (appears on first run) allows connecting to an existing MySQL/MariaDB or PostgreSQL database. You can also link a database container, e. g. `--link my-mysql:mysql`, and then use `mysql` as the database host on setup. More info is in the docker-compose section.
+
+## Persistent data
+The Nextcloud installation and all data beyond what lives in the database (file uploads, etc) are stored in the [unnamed docker volume](https://docs.docker.com/engine/tutorials/dockervolumes/#adding-a-data-volume) volume `/var/www/html`. The docker daemon will store that data within the docker directory `/var/lib/docker/volumes/...`. That means your data is saved even if the container crashes, is stopped or deleted.
+
+A named Docker volume or a mounted host directory should be used for upgrades and backups. To achieve this, you need one volume for your database container and one for Nextcloud.
+
+Nextcloud:
+- `/var/www/html/` folder where all nextcloud data lives
+```console
+$ docker run -d \
+-v nextcloud:/var/www/html \
+nextcloud
+```
+
+Database:
+- `/var/lib/mysql` MySQL / MariaDB Data
+- `/var/lib/postgresql/data` PostgreSQL Data
+```console
+$ docker run -d \
+-v db:/var/lib/mysql \
+mariadb
+```
+
+If you want to get fine grained access to your individual files, you can mount additional volumes for data, config, your theme and custom apps.
+The `data`, `config` files are stored in respective subfolders inside `/var/www/html/`. The apps are split into core `apps` (which are shipped with Nextcloud and you don't need to take care of) and a `custom_apps` folder. If you use a custom theme it would go into the `themes` subfolder.
+
+Overview of the folders that can be mounted as volumes:
+
+- `/var/www/html` Main folder, needed for updating
+- `/var/www/html/custom_apps` installed / modified apps
+- `/var/www/html/config` local configuration
+- `/var/www/html/data` the actual data of your Nextcloud
+- `/var/www/html/themes/` theming/branding
+
+If you want to use named volumes for all of these, it would look like this:
+```console
+$ docker run -d \
+-v nextcloud:/var/www/html \
+-v apps:/var/www/html/custom_apps \
+-v config:/var/www/html/config \
+-v data:/var/www/html/data \
+-v theme:/var/www/html/themes/ \
+nextcloud
+```
+
+## Using the Nextcloud command-line interface
+To use the [Nextcloud command-line interface](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/occ_command.html) (aka. `occ` command):
+```console
+$ docker exec --user www-data CONTAINER_ID php occ
+```
+or for docker-compose:
+```console
+$ docker-compose exec --user www-data app php occ
+```
+
+## Auto configuration via environment variables
+The nextcloud image supports auto configuration via environment variables. You can preconfigure everything that is asked on the install page on first run. To enable auto configuration, set your database connection via the following environment variables. ONLY use one database type!
+
+__SQLite__:
+- `SQLITE_DATABASE` Name of the database using sqlite
+
+__MYSQL/MariaDB__:
+- `MYSQL_DATABASE` Name of the database using mysql / mariadb.
+- `MYSQL_USER` Username for the database using mysql / mariadb.
+- `MYSQL_PASSWORD` Password for the database user using mysql / mariadb.
+- `MYSQL_HOST` Hostname of the database server using mysql / mariadb.
+
+__PostgreSQL__:
+- `POSTGRES_DB` Name of the database using postgres.
+- `POSTGRES_USER` Username for the database using postgres.
+- `POSTGRES_PASSWORD` Password for the database user using postgres.
+- `POSTGRES_HOST` Hostname of the database server using postgres.
+
+If you set any values, they will not be asked in the install page on first run. With a complete configuration by using all variables for your database type, you can additionally configure your Nextcloud instance by setting admin user and password (only works if you set both):
+
+- `NEXTCLOUD_ADMIN_USER` Name of the Nextcloud admin user.
+- `NEXTCLOUD_ADMIN_PASSWORD` Password for the Nextcloud admin user.
+
+If you want, you can set the data directory, otherwise default value will be used.
+
+- `NEXTCLOUD_DATA_DIR` (default: _/var/www/html/data_) Configures the data directory where nextcloud stores all files from the users.
+
+One or more trusted domains can be set through environment variable, too. They will be added to the configuration after install.
+
+- `NEXTCLOUD_TRUSTED_DOMAINS` (not set by default) Optional space-separated list of domains
+
+The install and update script is only triggered when a default command is used (`apache-foreground` or `php-fpm`). If you use a custom command you have to enable the install / update with
+
+- `NEXTCLOUD_UPDATE` (default: _0_)
+
+If you want to use Redis you have to create a separate [Redis](https://hub.docker.com/_/redis/) container in your setup / in your docker-compose file. To inform Nextcloud about the Redis container, pass in the following parameters:
+
+- `REDIS_HOST` (not set by default) Name of Redis container
+- `REDIS_HOST_PORT` (default: _6379_) Optional port for Redis, only use for external Redis servers that run on non-standard ports.
+- `REDIS_HOST_PASSWORD` (not set by default) Redis password
+
+The use of Redis is recommended to prevent file locking problems. See the examples for further instructions.
+
+To use an external SMTP server, you have to provide the connection details. To configure Nextcloud to use SMTP add:
+
+- `SMTP_HOST` (not set by default): The hostname of the SMTP server.
+- `SMTP_SECURE` (empty by default): Set to `ssl` to use SSL, or `tls` to use STARTTLS.
+- `SMTP_PORT` (default: `465` for SSL and `25` for non-secure connections): Optional port for the SMTP connection. Use `587` for an alternative port for STARTTLS.
+- `SMTP_AUTHTYPE` (default: `LOGIN`): The method used for authentication. Use `PLAIN` if no authentication is required.
+- `SMTP_NAME` (empty by default): The username for the authentication.
+- `SMTP_PASSWORD` (empty by default): The password for the authentication.
+- `MAIL_FROM_ADDRESS` (not set by default): Use this address for the 'from' field in the emails sent by Nextcloud.
+- `MAIL_DOMAIN` (not set by default): Set a different domain for the emails than the domain where Nextcloud is installed.
+
+Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/email_configuration.html) for other values to configure SMTP.
+
+To use an external S3 compatible object store as primary storage, set the following variables:
+- `OBJECTSTORE_S3_HOST`: The hostname of the object storage server
+- `OBJECTSTORE_S3_BUCKET`: The name of the bucket that Nextcloud should store the data in
+- `OBJECTSTORE_S3_KEY`: AWS style access key
+- `OBJECTSTORE_S3_SECRET`: AWS style secret access key
+- `OBJECTSTORE_S3_PORT`: The port that the object storage server is being served over
+- `OBJECTSTORE_S3_SSL` (default: `true`): Whether or not SSL/TLS should be used to communicate with object storage server
+- `OBJECTSTORE_S3_REGION`: The region that the S3 bucket resides in.
+- `OBJECTSTORE_S3_USEPATH_STYLE` (default: `false`): Not required for AWS S3
+
+Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/primary_storage.html#simple-storage-service-s3) for more information.
+
+To use an external OpenStack Swift object store as primary storage, set the following variables:
+- `OBJECTSTORE_SWIFT_URL`: The Swift identity (Keystone) endpoint
+- `OBJECTSTORE_SWIFT_AUTOCREATE` (default: `false`): Whether or not Nextcloud should automatically create the Swift container
+- `OBJECTSTORE_SWIFT_USER_NAME`: Swift username
+- `OBJECTSTORE_SWIFT_USER_PASSWORD`: Swift user password
+- `OBJECTSTORE_SWIFT_USER_DOMAIN` (default: `Default`): Swift user domain
+- `OBJECTSTORE_SWIFT_PROJECT_NAME`: OpenStack project name
+- `OBJECTSTORE_SWIFT_PROJECT_DOMAIN` (default: `Default`): OpenStack project domain
+- `OBJECTSTORE_SWIFT_SERVICE_NAME` (default: `swift`): Swift service name
+- `OBJECTSTORE_SWIFT_SERVICE_REGION`: Swift endpoint region
+- `OBJECTSTORE_SWIFT_CONTAINER_NAME`: Swift container (bucket) that Nextcloud should store the data in
+
+Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/primary_storage.html#openstack-swift) for more information.
+
+
+## Using the apache image behind a reverse proxy and auto configure server host and protocol
+
+The apache image will replace the remote addr (ip address visible to Nextcloud) with the ip address from `X-Real-IP` if the request is coming from a proxy in 10.0.0.0/8, 172.16.0.0/12 or 192.168.0.0/16 by default. If you want Nextcloud to pick up the server host (`HTTP_X_FORWARDED_HOST`), protocol (`HTTP_X_FORWARDED_PROTO`) and client ip (`HTTP_X_FORWARDED_FOR`) from a trusted proxy disable rewrite ip and the reverse proxies ip address to `TRUSTED_PROXIES`.
+
+- `APACHE_DISABLE_REWRITE_IP` (not set by default): Set to 1 to disable rewrite ip.
+
+- `TRUSTED_PROXIES` (empty by default): A space-separated list of trusted proxies. CIDR notation is supported for IPv4.
+
+If the `TRUSTED_PROXIES` approach does not work for you, try using fixed values for overwrite parameters.
+
+- `OVERWRITEHOST` (empty by default): Set the hostname of the proxy. Can also specify a port.
+- `OVERWRITEPROTOCOL` (empty by default): Set the protocol of the proxy, http or https.
+- `OVERWRITEWEBROOT` (empty by default): Set the absolute path of the proxy.
+- `OVERWRITECONDADDR` (empty by default): Regex to overwrite the values dependent on the remote address.
+
+Check the [Nexcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/reverse_proxy_configuration.html) for more details.
+
+Keep in mind that once set, removing these environment variables won't remove these values from the configuration file, due to how Nextcloud merges configuration files together.
+
+# Running this image with docker-compose
+The easiest way to get a fully featured and functional setup is using a `docker-compose` file. There are too many different possibilities to setup your system, so here are only some examples of what you have to look for.
+
+At first, make sure you have chosen the right base image (fpm or apache) and added features you wanted (see below). In every case, you would want to add a database container and docker volumes to get easy access to your persistent data. When you want to have your server reachable from the internet, adding HTTPS-encryption is mandatory! See below for more information.
+
+## Base version - apache
+This version will use the apache image and add a mariaDB container. The volumes are set to keep your data persistent. This setup provides **no ssl encryption** and is intended to run behind a proxy.
+
+Make sure to pass in values for `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` variables before you run this setup.
+
+```yaml
+version: '2'
+
+volumes:
+ nextcloud:
+ db:
+
+services:
+ db:
+ image: mariadb
+ command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+ restart: always
+ volumes:
+ - db:/var/lib/mysql
+ environment:
+ - MYSQL_ROOT_PASSWORD=
+ - MYSQL_PASSWORD=
+ - MYSQL_DATABASE=nextcloud
+ - MYSQL_USER=nextcloud
+
+ app:
+ image: nextcloud
+ ports:
+ - 8080:80
+ links:
+ - db
+ volumes:
+ - nextcloud:/var/www/html
+ restart: always
+
+```
+
+Then run `docker-compose up -d`, now you can access Nextcloud at http://localhost:8080/ from your host system.
+
+## Base version - FPM
+When using the FPM image, you need another container that acts as web server on port 80 and proxies the requests to the Nextcloud container. In this example a simple nginx container is combined with the Nextcloud-fpm image and a MariaDB database container. The data is stored in docker volumes. The nginx container also needs access to static files from your Nextcloud installation. It gets access to all the volumes mounted to Nextcloud via the `volumes_from` option.The configuration for nginx is stored in the configuration file `nginx.conf`, that is mounted into the container. An example can be found in the examples section [here](https://github.com/nextcloud/docker/tree/master/.examples).
+
+As this setup does **not include encryption**, it should be run behind a proxy.
+
+Make sure to pass in values for `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` variables before you run this setup.
+
+```yaml
+version: '2'
+
+volumes:
+ nextcloud:
+ db:
+
+services:
+ db:
+ image: mariadb
+ command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+ restart: always
+ volumes:
+ - db:/var/lib/mysql
+ environment:
+ - MYSQL_ROOT_PASSWORD=
+ - MYSQL_PASSWORD=
+ - MYSQL_DATABASE=nextcloud
+ - MYSQL_USER=nextcloud
+
+ app:
+ image: nextcloud:fpm
+ links:
+ - db
+ volumes:
+ - nextcloud:/var/www/html
+ restart: always
+
+ web:
+ image: nginx
+ ports:
+ - 8080:80
+ links:
+ - app
+ volumes:
+ - ./nginx.conf:/etc/nginx/nginx.conf:ro
+ volumes_from:
+ - app
+ restart: always
+```
+
+Then run `docker-compose up -d`, now you can access Nextcloud at http://localhost:8080/ from your host system.
+
+# Docker Secrets
+As an alternative to passing sensitive information via environment variables, _FILE may be appended to the previously listed environment variables, causing the initialization script to load the values for those variables from files present in the container. In particular, this can be used to load passwords from Docker secrets stored in /run/secrets/ files. For example:
+```yaml
+version: '3.2'
+
+services:
+ db:
+ image: postgres
+ restart: always
+ volumes:
+ - db:/var/lib/postgresql/data
+ environment:
+ - POSTGRES_DB_FILE=/run/secrets/postgres_db
+ - POSTGRES_USER_FILE=/run/secrets/postgres_user
+ - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
+ secrets:
+ - postgres_db
+ - postgres_password
+ - postgres_user
+
+ app:
+ image: nextcloud
+ restart: always
+ ports:
+ - 8080:80
+ volumes:
+ - nextcloud:/var/www/html
+ environment:
+ - POSTGRES_HOST=db
+ - POSTGRES_DB_FILE=/run/secrets/postgres_db
+ - POSTGRES_USER_FILE=/run/secrets/postgres_user
+ - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
+ - NEXTCLOUD_ADMIN_PASSWORD_FILE=/run/secrets/nextcloud_admin_password
+ - NEXTCLOUD_ADMIN_USER_FILE=/run/secrets/nextcloud_admin_user
+ depends_on:
+ - db
+ secrets:
+ - nextcloud_admin_password
+ - nextcloud_admin_user
+ - postgres_db
+ - postgres_password
+ - postgres_user
+
+volumes:
+ db:
+ nextcloud:
+
+secrets:
+ nextcloud_admin_password:
+ file: ./nextcloud_admin_password.txt # put admin password to this file
+ nextcloud_admin_user:
+ file: ./nextcloud_admin_user.txt # put admin username to this file
+ postgres_db:
+ file: ./postgres_db.txt # put postgresql db name to this file
+ postgres_password:
+ file: ./postgres_password.txt # put postgresql password to this file
+ postgres_user:
+ file: ./postgres_user.txt # put postgresql username to this file
+```
+
+Currently, this is only supported for `NEXTCLOUD_ADMIN_PASSWORD`, `NEXTCLOUD_ADMIN_USER`, `MYSQL_DB`, `MYSQL_PASSWORD`, `MYSQL_USER`, `POSTGRES_DB`, `POSTGRES_PASSWORD`, `POSTGRES_USER`.
+
+# Make your Nextcloud available from the internet
+Until here, your Nextcloud is just available from you docker host. If you want your Nextcloud available from the internet adding SSL encryption is mandatory.
+
+## HTTPS - SSL encryption
+There are many different possibilities to introduce encryption depending on your setup.
+
+We recommend using a reverse proxy in front of our Nextcloud installation. Your Nextcloud will only be reachable through the proxy, which encrypts all traffic to the clients. You can mount your manually generated certificates to the proxy or use a fully automated solution which generates and renews the certificates for you.
+
+In our [examples](https://github.com/nextcloud/docker/tree/master/.examples) section we have an example for a fully automated setup using a reverse proxy, a container for [Let's Encrypt](https://letsencrypt.org/) certificate handling, database and Nextcloud. It uses the popular [nginx-proxy](https://github.com/jwilder/nginx-proxy) and [docker-letsencrypt-nginx-proxy-companion](https://github.com/JrCs/docker-letsencrypt-nginx-proxy-companion) containers. Please check the according documentations before using this setup.
+
+# First use
+When you first access your Nextcloud, the setup wizard will appear and ask you to choose an administrator account username, password and the database connection. For the database use `db` as host and `nextcloud` as table and user name. Also enter the password you chose in your `docker-compose.yml` file.
+
+# Update to a newer version
+Updating the Nextcloud container is done by pulling the new image, throwing away the old container and starting the new one.
+
+**It is only possible to upgrade one major version at a time. For example, if you want to upgrade from version 14 to 16, you will have to upgrade from version 14 to 15, then from 15 to 16.**
+
+Since all data is stored in volumes, nothing gets lost. The startup script will check for the version in your volume and the installed docker version. If it finds a mismatch, it automatically starts the upgrade process. Don't forget to add all the volumes to your new container, so it works as expected.
+
+```console
+$ docker pull nextcloud
+$ docker stop
+$ docker rm
+$ docker run -d nextcloud
+```
+Beware that you have to run the same command with the options that you used to initially start your Nextcloud. That includes volumes, port mapping.
+
+When using docker-compose your compose file takes care of your configuration, so you just have to run:
+
+```console
+$ docker-compose pull
+$ docker-compose up -d
+```
+
+
+# Adding Features
+A lot of people want to use additional functionality inside their Nextcloud installation. If the image does not include the packages you need, you can easily build your own image on top of it.
+Start your derived image with the `FROM` statement and add whatever you like.
+
+```yaml
+FROM nextcloud:apache
+
+RUN ...
+
+```
+The [examples folder](https://github.com/nextcloud/docker/blob/master/.examples) gives a few examples on how to add certain functionalities, like including the cron job, smb-support or imap-authentication.
+
+If you use your own Dockerfile, you need to configure your docker-compose file accordingly. Switch out the `image` option with `build`. You have to specify the path to your Dockerfile. (in the example it's in the same directory next to the docker-compose file)
+
+```yaml
+ app:
+ build: .
+ links:
+ - db
+ volumes:
+ - data:/var/www/html/data
+ - config:/var/www/html/config
+ - apps:/var/www/html/apps
+ restart: always
+```
+
+If you intend to use another command to run the image, make sure that you set `NEXTCLOUD_UPDATE=1` in your Dockerfile. Otherwise the installation and update will not work.
+
+```yaml
+FROM nextcloud:apache
+
+...
+
+ENV NEXTCLOUD_UPDATE=1
+
+CMD ["/usr/bin/supervisord"]
+```
+
+
+**Updating** your own derived image is also very simple. When a new version of the Nextcloud image is available run:
+
+```console
+docker build -t your-name --pull .
+docker run -d your-name
+```
+
+or for docker-compose:
+```console
+docker-compose build --pull
+docker-compose up -d
+```
+
+The `--pull` option tells docker to look for new versions of the base image. Then the build instructions inside your `Dockerfile` are run on top of the new image.
+
+# Migrating an existing installation
+You're already using Nextcloud and want to switch to docker? Great! Here are some things to look out for:
+
+1. Define your whole Nextcloud infrastructure in a `docker-compose` file and run it with `docker-compose up -d` to get the base installation, volumes and database. Work from there.
+2. Restore your database from a mysqldump (nextcloud\_db\_1 is the name of your db container)
+ - To import from a MySQL dump use the following commands
+ ```console
+ docker cp ./database.dmp nextcloud_db_1:/dmp
+ docker-compose exec db sh -c "mysql -u USER -pPASSWORD nextcloud < /dmp"
+ docker-compose exec db rm /dmp
+ ```
+ - To import from a PostgreSQL dump use to following commands
+ ```console
+ docker cp ./database.dmp nextcloud_db_1:/dmp
+ docker-compose exec db sh -c "psql -U USER --set ON_ERROR_STOP=on nextcloud < /dmp"
+ docker-compose exec db rm /dmp
+ ```
+3. Edit your config.php
+ 1. Set database connection
+ - In case of MySQL database
+ ```php
+ 'dbhost' => 'db:3306',
+ ```
+ - In case of PostgreSQL database
+ ```php
+ 'dbhost' => 'db:5432',
+ ```
+ 2. Make sure you have no configuration for the `apps_paths`. Delete lines like these
+ ```diff
+ - "apps_paths" => array (
+ - 0 => array (
+ - "path" => OC::$SERVERROOT."/apps",
+ - "url" => "/apps",
+ - "writable" => true,
+ - ),
+ ```
+ 3. Make sure to have the `apps` directory non writable and the `custom_apps` directory writable
+ ```php
+ 'apps_paths' => array (
+ 0 => array (
+ 'path' => '/var/www/html/apps',
+ 'url' => '/apps',
+ 'writable' => false,
+ ),
+ 1 => array (
+ 'path' => '/var/www/html/custom_apps',
+ 'url' => '/custom_apps',
+ 'writable' => true,
+ ),
+ ),
+ ```
+ 4. Make sure your data directory is set to /var/www/html/data
+ ```php
+ 'datadirectory' => '/var/www/html/data',
+ ```
+
+
+4. Copy your data (nextcloud_app_1 is the name of your Nextcloud container):
+```console
+docker cp ./data/ nextcloud_app_1:/var/www/html/
+docker-compose exec app chown -R www-data:www-data /var/www/html/data
+docker cp ./theming/ nextcloud_app_1:/var/www/html/
+docker-compose exec app chown -R www-data:www-data /var/www/html/theming
+docker cp ./config/config.php nextcloud_app_1:/var/www/html/config
+docker-compose exec app chown -R www-data:www-data /var/www/html/config
+```
+5. Copy only the custom apps you use (or simply redownload them from the web interface):
+```console
+docker cp ./custom_apps/ nextcloud_data:/var/www/html/
+docker-compose exec app chown -R www-data:www-data /var/www/html/custom_apps
+```
+
+# Questions / Issues
+If you got any questions or problems using the image, please visit our [Github Repository](https://github.com/nextcloud/docker) and write an issue.
diff --git a/linux/advanced/nextcloud/pure/17/docker-compose.yml b/linux/advanced/nextcloud/pure/17/docker-compose.yml
new file mode 100644
index 000000000..61c86987f
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/17/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+ app:
+ image: "epicmorg/nextcloud:17"
+ build:
+ context: .
diff --git a/linux/nextcloud/17/smb.conf b/linux/advanced/nextcloud/pure/17/smb.conf
similarity index 100%
rename from linux/nextcloud/17/smb.conf
rename to linux/advanced/nextcloud/pure/17/smb.conf
diff --git a/linux/advanced/nextcloud/pure/17/sources.list b/linux/advanced/nextcloud/pure/17/sources.list
new file mode 100644
index 000000000..5a8c0081a
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/17/sources.list
@@ -0,0 +1,21 @@
+#main
+deb http://httpredir.debian.org/debian/ bullseye main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye main contrib non-free
+deb http://httpredir.debian.org/debian/ bullseye-updates main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye-updates main contrib non-free
+deb http://httpredir.debian.org/debian/ bullseye-backports main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye-backports main contrib non-free
+deb http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib non-free
+
+#security
+deb http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free
+deb-src http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free
+deb http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free
+deb-src http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free
+
+##multimedia
+# deb http://httpredir.debian.org/debian-multimedia/ bullseye main non-free
+# deb-src http://httpredir.debian.org/debian-multimedia/ bullseye main non-free
+# deb http://httpredir.debian.org/debian-multimedia/ bullseye-backports main
+# deb-src http://httpredir.debian.org/debian-multimedia/ bullseye-backports main
diff --git a/linux/advanced/nextcloud/pure/18/Dockerfile b/linux/advanced/nextcloud/pure/18/Dockerfile
new file mode 100644
index 000000000..aed264e6c
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/18/Dockerfile
@@ -0,0 +1,68 @@
+FROM nextcloud:18
+ENV DEBIAN_FRONTEND noninteractive
+
+##################################################################
+# adding normal sources list
+##################################################################
+RUN rm /etc/apt/sources.list
+COPY sources.list /etc/apt/sources.list
+
+##################################################################
+# adding some utils
+##################################################################
+RUN apt update -y && \
+ apt dist-upgrade -y && \
+ apt install -y --allow-unauthenticated \
+ apt-transport-https \
+ curl \
+ ca-certificates \
+ ghostscript \
+ nload \
+ htop \
+ mc \
+ nano \
+ sudo \
+ imagemagick \
+ imagemagick-common \
+ sqlite3 \
+ smbclient \
+ libsmbclient \
+ wget \
+ net-tools \
+ iputils-ping
+
+
+##################################################################
+# installing php repo + smbclient
+##################################################################
+RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
+RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list'
+RUN apt update -y && \
+ apt install -y --allow-unauthenticated \
+ libsmbclient-dev \
+ libmagickwand-dev \
+ libmagickcore-dev \
+ libc-client-dev \
+ libkrb5-dev \
+ libsqlite3-dev \
+ libssl-dev
+
+RUN pecl install inotify && \
+ docker-php-ext-enable inotify
+
+RUN pecl install smbclient && \
+ docker-php-ext-enable smbclient
+
+RUN docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
+ docker-php-ext-install imap && \
+ docker-php-ext-enable imap
+
+RUN docker-php-ext-install fileinfo bz2 intl ftp pdo_sqlite && \
+ docker-php-ext-enable fileinfo bz2 intl ftp pdo_sqlite
+
+##################################################################
+# smb fix
+##################################################################
+RUN rm -frv /etc/samba/smb.conf /usr/share/samba/smb.conf
+ADD smb.conf /etc/samba/
+ADD smb.conf /usr/share/samba/
diff --git a/linux/advanced/nextcloud/pure/18/Makefile b/linux/advanced/nextcloud/pure/18/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/18/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+ make build
+ make deploy
+ make clean
+
+build:
+ docker-compose build --compress --parallel
+
+deploy:
+ docker-compose push
+
+clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
diff --git a/linux/advanced/nextcloud/pure/18/README.md b/linux/advanced/nextcloud/pure/18/README.md
new file mode 100644
index 000000000..b6df71808
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/18/README.md
@@ -0,0 +1,527 @@
+# What is Nextcloud?
+
+[](https://github.com/nextcloud/docker/actions?query=workflow%3AImages)
+[](https://github.com/nextcloud/docker/actions?query=workflow%3Aupdate.sh)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/i386/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/mips64le/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/s390x/job/nextcloud)
+
+A safe home for all your data. Access & share your files, calendars, contacts, mail & more from any device, on your terms.
+
+
+
+# How to use this image
+This image is designed to be used in a micro-service environment. There are two versions of the image you can choose from.
+
+The `apache` tag contains a full Nextcloud installation including an apache web server. It is designed to be easy to use and gets you running pretty fast. This is also the default for the `latest` tag and version tags that are not further specified.
+
+The second option is a `fpm` container. It is based on the [php-fpm](https://hub.docker.com/_/php/) image and runs a fastCGI-Process that serves your Nextcloud page. To use this image it must be combined with any webserver that can proxy the http requests to the FastCGI-port of the container.
+
+[](http://play-with-docker.com?stack=https://raw.githubusercontent.com/nextcloud/docker/8db861d67f257a3e9ac1790ea06d4e2a7a193a6c/stack.yml)
+
+## Using the apache image
+The apache image contains a webserver and exposes port 80. To start the container type:
+
+```console
+$ docker run -d -p 8080:80 nextcloud
+```
+
+Now you can access Nextcloud at http://localhost:8080/ from your host system.
+
+
+## Using the fpm image
+To use the fpm image, you need an additional web server that can proxy http-request to the fpm-port of the container. For fpm connection this container exposes port 9000. In most cases, you might want use another container or your host as proxy.
+If you use your host you can address your Nextcloud container directly on port 9000. If you use another container, make sure that you add them to the same docker network (via `docker run --network ...` or a `docker-compose` file).
+In both cases you don't want to map the fpm port to your host.
+
+```console
+$ docker run -d nextcloud:fpm
+```
+
+As the fastCGI-Process is not capable of serving static files (style sheets, images, ...), the webserver needs access to these files. This can be achieved with the `volumes-from` option. You can find more information in the [docker-compose section](#running-this-image-with-docker-compose).
+
+## Using an external database
+By default, this container uses SQLite for data storage but the Nextcloud setup wizard (appears on first run) allows connecting to an existing MySQL/MariaDB or PostgreSQL database. You can also link a database container, e. g. `--link my-mysql:mysql`, and then use `mysql` as the database host on setup. More info is in the docker-compose section.
+
+## Persistent data
+The Nextcloud installation and all data beyond what lives in the database (file uploads, etc) are stored in the [unnamed docker volume](https://docs.docker.com/engine/tutorials/dockervolumes/#adding-a-data-volume) volume `/var/www/html`. The docker daemon will store that data within the docker directory `/var/lib/docker/volumes/...`. That means your data is saved even if the container crashes, is stopped or deleted.
+
+A named Docker volume or a mounted host directory should be used for upgrades and backups. To achieve this, you need one volume for your database container and one for Nextcloud.
+
+Nextcloud:
+- `/var/www/html/` folder where all nextcloud data lives
+```console
+$ docker run -d \
+-v nextcloud:/var/www/html \
+nextcloud
+```
+
+Database:
+- `/var/lib/mysql` MySQL / MariaDB Data
+- `/var/lib/postgresql/data` PostgreSQL Data
+```console
+$ docker run -d \
+-v db:/var/lib/mysql \
+mariadb
+```
+
+If you want to get fine grained access to your individual files, you can mount additional volumes for data, config, your theme and custom apps.
+The `data`, `config` files are stored in respective subfolders inside `/var/www/html/`. The apps are split into core `apps` (which are shipped with Nextcloud and you don't need to take care of) and a `custom_apps` folder. If you use a custom theme it would go into the `themes` subfolder.
+
+Overview of the folders that can be mounted as volumes:
+
+- `/var/www/html` Main folder, needed for updating
+- `/var/www/html/custom_apps` installed / modified apps
+- `/var/www/html/config` local configuration
+- `/var/www/html/data` the actual data of your Nextcloud
+- `/var/www/html/themes/` theming/branding
+
+If you want to use named volumes for all of these, it would look like this:
+```console
+$ docker run -d \
+-v nextcloud:/var/www/html \
+-v apps:/var/www/html/custom_apps \
+-v config:/var/www/html/config \
+-v data:/var/www/html/data \
+-v theme:/var/www/html/themes/ \
+nextcloud
+```
+
+## Using the Nextcloud command-line interface
+To use the [Nextcloud command-line interface](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/occ_command.html) (aka. `occ` command):
+```console
+$ docker exec --user www-data CONTAINER_ID php occ
+```
+or for docker-compose:
+```console
+$ docker-compose exec --user www-data app php occ
+```
+
+## Auto configuration via environment variables
+The nextcloud image supports auto configuration via environment variables. You can preconfigure everything that is asked on the install page on first run. To enable auto configuration, set your database connection via the following environment variables. ONLY use one database type!
+
+__SQLite__:
+- `SQLITE_DATABASE` Name of the database using sqlite
+
+__MYSQL/MariaDB__:
+- `MYSQL_DATABASE` Name of the database using mysql / mariadb.
+- `MYSQL_USER` Username for the database using mysql / mariadb.
+- `MYSQL_PASSWORD` Password for the database user using mysql / mariadb.
+- `MYSQL_HOST` Hostname of the database server using mysql / mariadb.
+
+__PostgreSQL__:
+- `POSTGRES_DB` Name of the database using postgres.
+- `POSTGRES_USER` Username for the database using postgres.
+- `POSTGRES_PASSWORD` Password for the database user using postgres.
+- `POSTGRES_HOST` Hostname of the database server using postgres.
+
+If you set any values, they will not be asked in the install page on first run. With a complete configuration by using all variables for your database type, you can additionally configure your Nextcloud instance by setting admin user and password (only works if you set both):
+
+- `NEXTCLOUD_ADMIN_USER` Name of the Nextcloud admin user.
+- `NEXTCLOUD_ADMIN_PASSWORD` Password for the Nextcloud admin user.
+
+If you want, you can set the data directory, otherwise default value will be used.
+
+- `NEXTCLOUD_DATA_DIR` (default: _/var/www/html/data_) Configures the data directory where nextcloud stores all files from the users.
+
+One or more trusted domains can be set through environment variable, too. They will be added to the configuration after install.
+
+- `NEXTCLOUD_TRUSTED_DOMAINS` (not set by default) Optional space-separated list of domains
+
+The install and update script is only triggered when a default command is used (`apache-foreground` or `php-fpm`). If you use a custom command you have to enable the install / update with
+
+- `NEXTCLOUD_UPDATE` (default: _0_)
+
+If you want to use Redis you have to create a separate [Redis](https://hub.docker.com/_/redis/) container in your setup / in your docker-compose file. To inform Nextcloud about the Redis container, pass in the following parameters:
+
+- `REDIS_HOST` (not set by default) Name of Redis container
+- `REDIS_HOST_PORT` (default: _6379_) Optional port for Redis, only use for external Redis servers that run on non-standard ports.
+- `REDIS_HOST_PASSWORD` (not set by default) Redis password
+
+The use of Redis is recommended to prevent file locking problems. See the examples for further instructions.
+
+To use an external SMTP server, you have to provide the connection details. To configure Nextcloud to use SMTP add:
+
+- `SMTP_HOST` (not set by default): The hostname of the SMTP server.
+- `SMTP_SECURE` (empty by default): Set to `ssl` to use SSL, or `tls` to use STARTTLS.
+- `SMTP_PORT` (default: `465` for SSL and `25` for non-secure connections): Optional port for the SMTP connection. Use `587` for an alternative port for STARTTLS.
+- `SMTP_AUTHTYPE` (default: `LOGIN`): The method used for authentication. Use `PLAIN` if no authentication is required.
+- `SMTP_NAME` (empty by default): The username for the authentication.
+- `SMTP_PASSWORD` (empty by default): The password for the authentication.
+- `MAIL_FROM_ADDRESS` (not set by default): Use this address for the 'from' field in the emails sent by Nextcloud.
+- `MAIL_DOMAIN` (not set by default): Set a different domain for the emails than the domain where Nextcloud is installed.
+
+Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/email_configuration.html) for other values to configure SMTP.
+
+To use an external S3 compatible object store as primary storage, set the following variables:
+- `OBJECTSTORE_S3_HOST`: The hostname of the object storage server
+- `OBJECTSTORE_S3_BUCKET`: The name of the bucket that Nextcloud should store the data in
+- `OBJECTSTORE_S3_KEY`: AWS style access key
+- `OBJECTSTORE_S3_SECRET`: AWS style secret access key
+- `OBJECTSTORE_S3_PORT`: The port that the object storage server is being served over
+- `OBJECTSTORE_S3_SSL` (default: `true`): Whether or not SSL/TLS should be used to communicate with object storage server
+- `OBJECTSTORE_S3_REGION`: The region that the S3 bucket resides in.
+- `OBJECTSTORE_S3_USEPATH_STYLE` (default: `false`): Not required for AWS S3
+
+Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/primary_storage.html#simple-storage-service-s3) for more information.
+
+To use an external OpenStack Swift object store as primary storage, set the following variables:
+- `OBJECTSTORE_SWIFT_URL`: The Swift identity (Keystone) endpoint
+- `OBJECTSTORE_SWIFT_AUTOCREATE` (default: `false`): Whether or not Nextcloud should automatically create the Swift container
+- `OBJECTSTORE_SWIFT_USER_NAME`: Swift username
+- `OBJECTSTORE_SWIFT_USER_PASSWORD`: Swift user password
+- `OBJECTSTORE_SWIFT_USER_DOMAIN` (default: `Default`): Swift user domain
+- `OBJECTSTORE_SWIFT_PROJECT_NAME`: OpenStack project name
+- `OBJECTSTORE_SWIFT_PROJECT_DOMAIN` (default: `Default`): OpenStack project domain
+- `OBJECTSTORE_SWIFT_SERVICE_NAME` (default: `swift`): Swift service name
+- `OBJECTSTORE_SWIFT_SERVICE_REGION`: Swift endpoint region
+- `OBJECTSTORE_SWIFT_CONTAINER_NAME`: Swift container (bucket) that Nextcloud should store the data in
+
+Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/primary_storage.html#openstack-swift) for more information.
+
+
+## Using the apache image behind a reverse proxy and auto configure server host and protocol
+
+The apache image will replace the remote addr (ip address visible to Nextcloud) with the ip address from `X-Real-IP` if the request is coming from a proxy in 10.0.0.0/8, 172.16.0.0/12 or 192.168.0.0/16 by default. If you want Nextcloud to pick up the server host (`HTTP_X_FORWARDED_HOST`), protocol (`HTTP_X_FORWARDED_PROTO`) and client ip (`HTTP_X_FORWARDED_FOR`) from a trusted proxy disable rewrite ip and the reverse proxies ip address to `TRUSTED_PROXIES`.
+
+- `APACHE_DISABLE_REWRITE_IP` (not set by default): Set to 1 to disable rewrite ip.
+
+- `TRUSTED_PROXIES` (empty by default): A space-separated list of trusted proxies. CIDR notation is supported for IPv4.
+
+If the `TRUSTED_PROXIES` approach does not work for you, try using fixed values for overwrite parameters.
+
+- `OVERWRITEHOST` (empty by default): Set the hostname of the proxy. Can also specify a port.
+- `OVERWRITEPROTOCOL` (empty by default): Set the protocol of the proxy, http or https.
+- `OVERWRITEWEBROOT` (empty by default): Set the absolute path of the proxy.
+- `OVERWRITECONDADDR` (empty by default): Regex to overwrite the values dependent on the remote address.
+
+Check the [Nexcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/reverse_proxy_configuration.html) for more details.
+
+Keep in mind that once set, removing these environment variables won't remove these values from the configuration file, due to how Nextcloud merges configuration files together.
+
+# Running this image with docker-compose
+The easiest way to get a fully featured and functional setup is using a `docker-compose` file. There are too many different possibilities to setup your system, so here are only some examples of what you have to look for.
+
+At first, make sure you have chosen the right base image (fpm or apache) and added features you wanted (see below). In every case, you would want to add a database container and docker volumes to get easy access to your persistent data. When you want to have your server reachable from the internet, adding HTTPS-encryption is mandatory! See below for more information.
+
+## Base version - apache
+This version will use the apache image and add a mariaDB container. The volumes are set to keep your data persistent. This setup provides **no ssl encryption** and is intended to run behind a proxy.
+
+Make sure to pass in values for `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` variables before you run this setup.
+
+```yaml
+version: '2'
+
+volumes:
+ nextcloud:
+ db:
+
+services:
+ db:
+ image: mariadb
+ command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+ restart: always
+ volumes:
+ - db:/var/lib/mysql
+ environment:
+ - MYSQL_ROOT_PASSWORD=
+ - MYSQL_PASSWORD=
+ - MYSQL_DATABASE=nextcloud
+ - MYSQL_USER=nextcloud
+
+ app:
+ image: nextcloud
+ ports:
+ - 8080:80
+ links:
+ - db
+ volumes:
+ - nextcloud:/var/www/html
+ restart: always
+
+```
+
+Then run `docker-compose up -d`, now you can access Nextcloud at http://localhost:8080/ from your host system.
+
+## Base version - FPM
+When using the FPM image, you need another container that acts as web server on port 80 and proxies the requests to the Nextcloud container. In this example a simple nginx container is combined with the Nextcloud-fpm image and a MariaDB database container. The data is stored in docker volumes. The nginx container also needs access to static files from your Nextcloud installation. It gets access to all the volumes mounted to Nextcloud via the `volumes_from` option.The configuration for nginx is stored in the configuration file `nginx.conf`, that is mounted into the container. An example can be found in the examples section [here](https://github.com/nextcloud/docker/tree/master/.examples).
+
+As this setup does **not include encryption**, it should be run behind a proxy.
+
+Make sure to pass in values for `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` variables before you run this setup.
+
+```yaml
+version: '2'
+
+volumes:
+ nextcloud:
+ db:
+
+services:
+ db:
+ image: mariadb
+ command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+ restart: always
+ volumes:
+ - db:/var/lib/mysql
+ environment:
+ - MYSQL_ROOT_PASSWORD=
+ - MYSQL_PASSWORD=
+ - MYSQL_DATABASE=nextcloud
+ - MYSQL_USER=nextcloud
+
+ app:
+ image: nextcloud:fpm
+ links:
+ - db
+ volumes:
+ - nextcloud:/var/www/html
+ restart: always
+
+ web:
+ image: nginx
+ ports:
+ - 8080:80
+ links:
+ - app
+ volumes:
+ - ./nginx.conf:/etc/nginx/nginx.conf:ro
+ volumes_from:
+ - app
+ restart: always
+```
+
+Then run `docker-compose up -d`, now you can access Nextcloud at http://localhost:8080/ from your host system.
+
+# Docker Secrets
+As an alternative to passing sensitive information via environment variables, _FILE may be appended to the previously listed environment variables, causing the initialization script to load the values for those variables from files present in the container. In particular, this can be used to load passwords from Docker secrets stored in /run/secrets/ files. For example:
+```yaml
+version: '3.2'
+
+services:
+ db:
+ image: postgres
+ restart: always
+ volumes:
+ - db:/var/lib/postgresql/data
+ environment:
+ - POSTGRES_DB_FILE=/run/secrets/postgres_db
+ - POSTGRES_USER_FILE=/run/secrets/postgres_user
+ - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
+ secrets:
+ - postgres_db
+ - postgres_password
+ - postgres_user
+
+ app:
+ image: nextcloud
+ restart: always
+ ports:
+ - 8080:80
+ volumes:
+ - nextcloud:/var/www/html
+ environment:
+ - POSTGRES_HOST=db
+ - POSTGRES_DB_FILE=/run/secrets/postgres_db
+ - POSTGRES_USER_FILE=/run/secrets/postgres_user
+ - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
+ - NEXTCLOUD_ADMIN_PASSWORD_FILE=/run/secrets/nextcloud_admin_password
+ - NEXTCLOUD_ADMIN_USER_FILE=/run/secrets/nextcloud_admin_user
+ depends_on:
+ - db
+ secrets:
+ - nextcloud_admin_password
+ - nextcloud_admin_user
+ - postgres_db
+ - postgres_password
+ - postgres_user
+
+volumes:
+ db:
+ nextcloud:
+
+secrets:
+ nextcloud_admin_password:
+ file: ./nextcloud_admin_password.txt # put admin password to this file
+ nextcloud_admin_user:
+ file: ./nextcloud_admin_user.txt # put admin username to this file
+ postgres_db:
+ file: ./postgres_db.txt # put postgresql db name to this file
+ postgres_password:
+ file: ./postgres_password.txt # put postgresql password to this file
+ postgres_user:
+ file: ./postgres_user.txt # put postgresql username to this file
+```
+
+Currently, this is only supported for `NEXTCLOUD_ADMIN_PASSWORD`, `NEXTCLOUD_ADMIN_USER`, `MYSQL_DB`, `MYSQL_PASSWORD`, `MYSQL_USER`, `POSTGRES_DB`, `POSTGRES_PASSWORD`, `POSTGRES_USER`.
+
+# Make your Nextcloud available from the internet
+Until here, your Nextcloud is just available from you docker host. If you want your Nextcloud available from the internet adding SSL encryption is mandatory.
+
+## HTTPS - SSL encryption
+There are many different possibilities to introduce encryption depending on your setup.
+
+We recommend using a reverse proxy in front of our Nextcloud installation. Your Nextcloud will only be reachable through the proxy, which encrypts all traffic to the clients. You can mount your manually generated certificates to the proxy or use a fully automated solution which generates and renews the certificates for you.
+
+In our [examples](https://github.com/nextcloud/docker/tree/master/.examples) section we have an example for a fully automated setup using a reverse proxy, a container for [Let's Encrypt](https://letsencrypt.org/) certificate handling, database and Nextcloud. It uses the popular [nginx-proxy](https://github.com/jwilder/nginx-proxy) and [docker-letsencrypt-nginx-proxy-companion](https://github.com/JrCs/docker-letsencrypt-nginx-proxy-companion) containers. Please check the according documentations before using this setup.
+
+# First use
+When you first access your Nextcloud, the setup wizard will appear and ask you to choose an administrator account username, password and the database connection. For the database use `db` as host and `nextcloud` as table and user name. Also enter the password you chose in your `docker-compose.yml` file.
+
+# Update to a newer version
+Updating the Nextcloud container is done by pulling the new image, throwing away the old container and starting the new one.
+
+**It is only possible to upgrade one major version at a time. For example, if you want to upgrade from version 14 to 16, you will have to upgrade from version 14 to 15, then from 15 to 16.**
+
+Since all data is stored in volumes, nothing gets lost. The startup script will check for the version in your volume and the installed docker version. If it finds a mismatch, it automatically starts the upgrade process. Don't forget to add all the volumes to your new container, so it works as expected.
+
+```console
+$ docker pull nextcloud
+$ docker stop
+$ docker rm
+$ docker run -d nextcloud
+```
+Beware that you have to run the same command with the options that you used to initially start your Nextcloud. That includes volumes, port mapping.
+
+When using docker-compose your compose file takes care of your configuration, so you just have to run:
+
+```console
+$ docker-compose pull
+$ docker-compose up -d
+```
+
+
+# Adding Features
+A lot of people want to use additional functionality inside their Nextcloud installation. If the image does not include the packages you need, you can easily build your own image on top of it.
+Start your derived image with the `FROM` statement and add whatever you like.
+
+```yaml
+FROM nextcloud:apache
+
+RUN ...
+
+```
+The [examples folder](https://github.com/nextcloud/docker/blob/master/.examples) gives a few examples on how to add certain functionalities, like including the cron job, smb-support or imap-authentication.
+
+If you use your own Dockerfile, you need to configure your docker-compose file accordingly. Switch out the `image` option with `build`. You have to specify the path to your Dockerfile. (in the example it's in the same directory next to the docker-compose file)
+
+```yaml
+ app:
+ build: .
+ links:
+ - db
+ volumes:
+ - data:/var/www/html/data
+ - config:/var/www/html/config
+ - apps:/var/www/html/apps
+ restart: always
+```
+
+If you intend to use another command to run the image, make sure that you set `NEXTCLOUD_UPDATE=1` in your Dockerfile. Otherwise the installation and update will not work.
+
+```yaml
+FROM nextcloud:apache
+
+...
+
+ENV NEXTCLOUD_UPDATE=1
+
+CMD ["/usr/bin/supervisord"]
+```
+
+
+**Updating** your own derived image is also very simple. When a new version of the Nextcloud image is available run:
+
+```console
+docker build -t your-name --pull .
+docker run -d your-name
+```
+
+or for docker-compose:
+```console
+docker-compose build --pull
+docker-compose up -d
+```
+
+The `--pull` option tells docker to look for new versions of the base image. Then the build instructions inside your `Dockerfile` are run on top of the new image.
+
+# Migrating an existing installation
+You're already using Nextcloud and want to switch to docker? Great! Here are some things to look out for:
+
+1. Define your whole Nextcloud infrastructure in a `docker-compose` file and run it with `docker-compose up -d` to get the base installation, volumes and database. Work from there.
+2. Restore your database from a mysqldump (nextcloud\_db\_1 is the name of your db container)
+ - To import from a MySQL dump use the following commands
+ ```console
+ docker cp ./database.dmp nextcloud_db_1:/dmp
+ docker-compose exec db sh -c "mysql -u USER -pPASSWORD nextcloud < /dmp"
+ docker-compose exec db rm /dmp
+ ```
+ - To import from a PostgreSQL dump use to following commands
+ ```console
+ docker cp ./database.dmp nextcloud_db_1:/dmp
+ docker-compose exec db sh -c "psql -U USER --set ON_ERROR_STOP=on nextcloud < /dmp"
+ docker-compose exec db rm /dmp
+ ```
+3. Edit your config.php
+ 1. Set database connection
+ - In case of MySQL database
+ ```php
+ 'dbhost' => 'db:3306',
+ ```
+ - In case of PostgreSQL database
+ ```php
+ 'dbhost' => 'db:5432',
+ ```
+ 2. Make sure you have no configuration for the `apps_paths`. Delete lines like these
+ ```diff
+ - "apps_paths" => array (
+ - 0 => array (
+ - "path" => OC::$SERVERROOT."/apps",
+ - "url" => "/apps",
+ - "writable" => true,
+ - ),
+ ```
+ 3. Make sure to have the `apps` directory non writable and the `custom_apps` directory writable
+ ```php
+ 'apps_paths' => array (
+ 0 => array (
+ 'path' => '/var/www/html/apps',
+ 'url' => '/apps',
+ 'writable' => false,
+ ),
+ 1 => array (
+ 'path' => '/var/www/html/custom_apps',
+ 'url' => '/custom_apps',
+ 'writable' => true,
+ ),
+ ),
+ ```
+ 4. Make sure your data directory is set to /var/www/html/data
+ ```php
+ 'datadirectory' => '/var/www/html/data',
+ ```
+
+
+4. Copy your data (nextcloud_app_1 is the name of your Nextcloud container):
+```console
+docker cp ./data/ nextcloud_app_1:/var/www/html/
+docker-compose exec app chown -R www-data:www-data /var/www/html/data
+docker cp ./theming/ nextcloud_app_1:/var/www/html/
+docker-compose exec app chown -R www-data:www-data /var/www/html/theming
+docker cp ./config/config.php nextcloud_app_1:/var/www/html/config
+docker-compose exec app chown -R www-data:www-data /var/www/html/config
+```
+5. Copy only the custom apps you use (or simply redownload them from the web interface):
+```console
+docker cp ./custom_apps/ nextcloud_data:/var/www/html/
+docker-compose exec app chown -R www-data:www-data /var/www/html/custom_apps
+```
+
+# Questions / Issues
+If you got any questions or problems using the image, please visit our [Github Repository](https://github.com/nextcloud/docker) and write an issue.
diff --git a/linux/advanced/nextcloud/pure/18/docker-compose.yml b/linux/advanced/nextcloud/pure/18/docker-compose.yml
new file mode 100644
index 000000000..1c1b6a5ce
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/18/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+ app:
+ image: "epicmorg/nextcloud:18"
+ build:
+ context: .
diff --git a/linux/nextcloud/18/smb.conf b/linux/advanced/nextcloud/pure/18/smb.conf
similarity index 100%
rename from linux/nextcloud/18/smb.conf
rename to linux/advanced/nextcloud/pure/18/smb.conf
diff --git a/linux/advanced/nextcloud/pure/18/sources.list b/linux/advanced/nextcloud/pure/18/sources.list
new file mode 100644
index 000000000..5a8c0081a
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/18/sources.list
@@ -0,0 +1,21 @@
+#main
+deb http://httpredir.debian.org/debian/ bullseye main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye main contrib non-free
+deb http://httpredir.debian.org/debian/ bullseye-updates main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye-updates main contrib non-free
+deb http://httpredir.debian.org/debian/ bullseye-backports main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye-backports main contrib non-free
+deb http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib non-free
+
+#security
+deb http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free
+deb-src http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free
+deb http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free
+deb-src http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free
+
+##multimedia
+# deb http://httpredir.debian.org/debian-multimedia/ bullseye main non-free
+# deb-src http://httpredir.debian.org/debian-multimedia/ bullseye main non-free
+# deb http://httpredir.debian.org/debian-multimedia/ bullseye-backports main
+# deb-src http://httpredir.debian.org/debian-multimedia/ bullseye-backports main
diff --git a/linux/advanced/nextcloud/pure/19/Dockerfile b/linux/advanced/nextcloud/pure/19/Dockerfile
new file mode 100644
index 000000000..f84a8408b
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/19/Dockerfile
@@ -0,0 +1,68 @@
+FROM nextcloud:19
+ENV DEBIAN_FRONTEND noninteractive
+
+##################################################################
+# adding normal sources list
+##################################################################
+RUN rm /etc/apt/sources.list
+COPY sources.list /etc/apt/sources.list
+
+##################################################################
+# adding some utils
+##################################################################
+RUN apt update -y && \
+ apt dist-upgrade -y && \
+ apt install -y --allow-unauthenticated \
+ apt-transport-https \
+ curl \
+ ca-certificates \
+ ghostscript \
+ nload \
+ htop \
+ mc \
+ nano \
+ sudo \
+ imagemagick \
+ imagemagick-common \
+ sqlite3 \
+ smbclient \
+ libsmbclient \
+ wget \
+ net-tools \
+ iputils-ping
+
+
+##################################################################
+# installing php repo + smbclient
+##################################################################
+RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
+RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list'
+RUN apt update -y && \
+ apt install -y --allow-unauthenticated \
+ libsmbclient-dev \
+ libmagickwand-dev \
+ libmagickcore-dev \
+ libc-client-dev \
+ libkrb5-dev \
+ libsqlite3-dev \
+ libssl-dev
+
+RUN pecl install inotify && \
+ docker-php-ext-enable inotify
+
+RUN pecl install smbclient && \
+ docker-php-ext-enable smbclient
+
+RUN docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
+ docker-php-ext-install imap && \
+ docker-php-ext-enable imap
+
+RUN docker-php-ext-install fileinfo bz2 intl ftp pdo_sqlite && \
+ docker-php-ext-enable fileinfo bz2 intl ftp pdo_sqlite
+
+##################################################################
+# smb fix
+##################################################################
+RUN rm -frv /etc/samba/smb.conf /usr/share/samba/smb.conf
+ADD smb.conf /etc/samba/
+ADD smb.conf /usr/share/samba/
diff --git a/linux/advanced/nextcloud/pure/19/Makefile b/linux/advanced/nextcloud/pure/19/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/19/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+ make build
+ make deploy
+ make clean
+
+build:
+ docker-compose build --compress --parallel
+
+deploy:
+ docker-compose push
+
+clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
diff --git a/linux/advanced/nextcloud/pure/19/README.md b/linux/advanced/nextcloud/pure/19/README.md
new file mode 100644
index 000000000..b6df71808
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/19/README.md
@@ -0,0 +1,527 @@
+# What is Nextcloud?
+
+[](https://github.com/nextcloud/docker/actions?query=workflow%3AImages)
+[](https://github.com/nextcloud/docker/actions?query=workflow%3Aupdate.sh)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/i386/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/mips64le/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/s390x/job/nextcloud)
+
+A safe home for all your data. Access & share your files, calendars, contacts, mail & more from any device, on your terms.
+
+
+
+# How to use this image
+This image is designed to be used in a micro-service environment. There are two versions of the image you can choose from.
+
+The `apache` tag contains a full Nextcloud installation including an apache web server. It is designed to be easy to use and gets you running pretty fast. This is also the default for the `latest` tag and version tags that are not further specified.
+
+The second option is a `fpm` container. It is based on the [php-fpm](https://hub.docker.com/_/php/) image and runs a fastCGI-Process that serves your Nextcloud page. To use this image it must be combined with any webserver that can proxy the http requests to the FastCGI-port of the container.
+
+[](http://play-with-docker.com?stack=https://raw.githubusercontent.com/nextcloud/docker/8db861d67f257a3e9ac1790ea06d4e2a7a193a6c/stack.yml)
+
+## Using the apache image
+The apache image contains a webserver and exposes port 80. To start the container type:
+
+```console
+$ docker run -d -p 8080:80 nextcloud
+```
+
+Now you can access Nextcloud at http://localhost:8080/ from your host system.
+
+
+## Using the fpm image
+To use the fpm image, you need an additional web server that can proxy http-request to the fpm-port of the container. For fpm connection this container exposes port 9000. In most cases, you might want use another container or your host as proxy.
+If you use your host you can address your Nextcloud container directly on port 9000. If you use another container, make sure that you add them to the same docker network (via `docker run --network ...` or a `docker-compose` file).
+In both cases you don't want to map the fpm port to your host.
+
+```console
+$ docker run -d nextcloud:fpm
+```
+
+As the fastCGI-Process is not capable of serving static files (style sheets, images, ...), the webserver needs access to these files. This can be achieved with the `volumes-from` option. You can find more information in the [docker-compose section](#running-this-image-with-docker-compose).
+
+## Using an external database
+By default, this container uses SQLite for data storage but the Nextcloud setup wizard (appears on first run) allows connecting to an existing MySQL/MariaDB or PostgreSQL database. You can also link a database container, e. g. `--link my-mysql:mysql`, and then use `mysql` as the database host on setup. More info is in the docker-compose section.
+
+## Persistent data
+The Nextcloud installation and all data beyond what lives in the database (file uploads, etc) are stored in the [unnamed docker volume](https://docs.docker.com/engine/tutorials/dockervolumes/#adding-a-data-volume) volume `/var/www/html`. The docker daemon will store that data within the docker directory `/var/lib/docker/volumes/...`. That means your data is saved even if the container crashes, is stopped or deleted.
+
+A named Docker volume or a mounted host directory should be used for upgrades and backups. To achieve this, you need one volume for your database container and one for Nextcloud.
+
+Nextcloud:
+- `/var/www/html/` folder where all nextcloud data lives
+```console
+$ docker run -d \
+-v nextcloud:/var/www/html \
+nextcloud
+```
+
+Database:
+- `/var/lib/mysql` MySQL / MariaDB Data
+- `/var/lib/postgresql/data` PostgreSQL Data
+```console
+$ docker run -d \
+-v db:/var/lib/mysql \
+mariadb
+```
+
+If you want to get fine grained access to your individual files, you can mount additional volumes for data, config, your theme and custom apps.
+The `data`, `config` files are stored in respective subfolders inside `/var/www/html/`. The apps are split into core `apps` (which are shipped with Nextcloud and you don't need to take care of) and a `custom_apps` folder. If you use a custom theme it would go into the `themes` subfolder.
+
+Overview of the folders that can be mounted as volumes:
+
+- `/var/www/html` Main folder, needed for updating
+- `/var/www/html/custom_apps` installed / modified apps
+- `/var/www/html/config` local configuration
+- `/var/www/html/data` the actual data of your Nextcloud
+- `/var/www/html/themes/` theming/branding
+
+If you want to use named volumes for all of these, it would look like this:
+```console
+$ docker run -d \
+-v nextcloud:/var/www/html \
+-v apps:/var/www/html/custom_apps \
+-v config:/var/www/html/config \
+-v data:/var/www/html/data \
+-v theme:/var/www/html/themes/ \
+nextcloud
+```
+
+## Using the Nextcloud command-line interface
+To use the [Nextcloud command-line interface](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/occ_command.html) (aka. `occ` command):
+```console
+$ docker exec --user www-data CONTAINER_ID php occ
+```
+or for docker-compose:
+```console
+$ docker-compose exec --user www-data app php occ
+```
+
+## Auto configuration via environment variables
+The nextcloud image supports auto configuration via environment variables. You can preconfigure everything that is asked on the install page on first run. To enable auto configuration, set your database connection via the following environment variables. ONLY use one database type!
+
+__SQLite__:
+- `SQLITE_DATABASE` Name of the database using sqlite
+
+__MYSQL/MariaDB__:
+- `MYSQL_DATABASE` Name of the database using mysql / mariadb.
+- `MYSQL_USER` Username for the database using mysql / mariadb.
+- `MYSQL_PASSWORD` Password for the database user using mysql / mariadb.
+- `MYSQL_HOST` Hostname of the database server using mysql / mariadb.
+
+__PostgreSQL__:
+- `POSTGRES_DB` Name of the database using postgres.
+- `POSTGRES_USER` Username for the database using postgres.
+- `POSTGRES_PASSWORD` Password for the database user using postgres.
+- `POSTGRES_HOST` Hostname of the database server using postgres.
+
+If you set any values, they will not be asked in the install page on first run. With a complete configuration by using all variables for your database type, you can additionally configure your Nextcloud instance by setting admin user and password (only works if you set both):
+
+- `NEXTCLOUD_ADMIN_USER` Name of the Nextcloud admin user.
+- `NEXTCLOUD_ADMIN_PASSWORD` Password for the Nextcloud admin user.
+
+If you want, you can set the data directory, otherwise default value will be used.
+
+- `NEXTCLOUD_DATA_DIR` (default: _/var/www/html/data_) Configures the data directory where nextcloud stores all files from the users.
+
+One or more trusted domains can be set through environment variable, too. They will be added to the configuration after install.
+
+- `NEXTCLOUD_TRUSTED_DOMAINS` (not set by default) Optional space-separated list of domains
+
+The install and update script is only triggered when a default command is used (`apache-foreground` or `php-fpm`). If you use a custom command you have to enable the install / update with
+
+- `NEXTCLOUD_UPDATE` (default: _0_)
+
+If you want to use Redis you have to create a separate [Redis](https://hub.docker.com/_/redis/) container in your setup / in your docker-compose file. To inform Nextcloud about the Redis container, pass in the following parameters:
+
+- `REDIS_HOST` (not set by default) Name of Redis container
+- `REDIS_HOST_PORT` (default: _6379_) Optional port for Redis, only use for external Redis servers that run on non-standard ports.
+- `REDIS_HOST_PASSWORD` (not set by default) Redis password
+
+The use of Redis is recommended to prevent file locking problems. See the examples for further instructions.
+
+To use an external SMTP server, you have to provide the connection details. To configure Nextcloud to use SMTP add:
+
+- `SMTP_HOST` (not set by default): The hostname of the SMTP server.
+- `SMTP_SECURE` (empty by default): Set to `ssl` to use SSL, or `tls` to use STARTTLS.
+- `SMTP_PORT` (default: `465` for SSL and `25` for non-secure connections): Optional port for the SMTP connection. Use `587` for an alternative port for STARTTLS.
+- `SMTP_AUTHTYPE` (default: `LOGIN`): The method used for authentication. Use `PLAIN` if no authentication is required.
+- `SMTP_NAME` (empty by default): The username for the authentication.
+- `SMTP_PASSWORD` (empty by default): The password for the authentication.
+- `MAIL_FROM_ADDRESS` (not set by default): Use this address for the 'from' field in the emails sent by Nextcloud.
+- `MAIL_DOMAIN` (not set by default): Set a different domain for the emails than the domain where Nextcloud is installed.
+
+Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/email_configuration.html) for other values to configure SMTP.
+
+To use an external S3 compatible object store as primary storage, set the following variables:
+- `OBJECTSTORE_S3_HOST`: The hostname of the object storage server
+- `OBJECTSTORE_S3_BUCKET`: The name of the bucket that Nextcloud should store the data in
+- `OBJECTSTORE_S3_KEY`: AWS style access key
+- `OBJECTSTORE_S3_SECRET`: AWS style secret access key
+- `OBJECTSTORE_S3_PORT`: The port that the object storage server is being served over
+- `OBJECTSTORE_S3_SSL` (default: `true`): Whether or not SSL/TLS should be used to communicate with object storage server
+- `OBJECTSTORE_S3_REGION`: The region that the S3 bucket resides in.
+- `OBJECTSTORE_S3_USEPATH_STYLE` (default: `false`): Not required for AWS S3
+
+Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/primary_storage.html#simple-storage-service-s3) for more information.
+
+To use an external OpenStack Swift object store as primary storage, set the following variables:
+- `OBJECTSTORE_SWIFT_URL`: The Swift identity (Keystone) endpoint
+- `OBJECTSTORE_SWIFT_AUTOCREATE` (default: `false`): Whether or not Nextcloud should automatically create the Swift container
+- `OBJECTSTORE_SWIFT_USER_NAME`: Swift username
+- `OBJECTSTORE_SWIFT_USER_PASSWORD`: Swift user password
+- `OBJECTSTORE_SWIFT_USER_DOMAIN` (default: `Default`): Swift user domain
+- `OBJECTSTORE_SWIFT_PROJECT_NAME`: OpenStack project name
+- `OBJECTSTORE_SWIFT_PROJECT_DOMAIN` (default: `Default`): OpenStack project domain
+- `OBJECTSTORE_SWIFT_SERVICE_NAME` (default: `swift`): Swift service name
+- `OBJECTSTORE_SWIFT_SERVICE_REGION`: Swift endpoint region
+- `OBJECTSTORE_SWIFT_CONTAINER_NAME`: Swift container (bucket) that Nextcloud should store the data in
+
+Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/primary_storage.html#openstack-swift) for more information.
+
+
+## Using the apache image behind a reverse proxy and auto configure server host and protocol
+
+The apache image will replace the remote addr (ip address visible to Nextcloud) with the ip address from `X-Real-IP` if the request is coming from a proxy in 10.0.0.0/8, 172.16.0.0/12 or 192.168.0.0/16 by default. If you want Nextcloud to pick up the server host (`HTTP_X_FORWARDED_HOST`), protocol (`HTTP_X_FORWARDED_PROTO`) and client ip (`HTTP_X_FORWARDED_FOR`) from a trusted proxy disable rewrite ip and the reverse proxies ip address to `TRUSTED_PROXIES`.
+
+- `APACHE_DISABLE_REWRITE_IP` (not set by default): Set to 1 to disable rewrite ip.
+
+- `TRUSTED_PROXIES` (empty by default): A space-separated list of trusted proxies. CIDR notation is supported for IPv4.
+
+If the `TRUSTED_PROXIES` approach does not work for you, try using fixed values for overwrite parameters.
+
+- `OVERWRITEHOST` (empty by default): Set the hostname of the proxy. Can also specify a port.
+- `OVERWRITEPROTOCOL` (empty by default): Set the protocol of the proxy, http or https.
+- `OVERWRITEWEBROOT` (empty by default): Set the absolute path of the proxy.
+- `OVERWRITECONDADDR` (empty by default): Regex to overwrite the values dependent on the remote address.
+
+Check the [Nexcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/reverse_proxy_configuration.html) for more details.
+
+Keep in mind that once set, removing these environment variables won't remove these values from the configuration file, due to how Nextcloud merges configuration files together.
+
+# Running this image with docker-compose
+The easiest way to get a fully featured and functional setup is using a `docker-compose` file. There are too many different possibilities to setup your system, so here are only some examples of what you have to look for.
+
+At first, make sure you have chosen the right base image (fpm or apache) and added features you wanted (see below). In every case, you would want to add a database container and docker volumes to get easy access to your persistent data. When you want to have your server reachable from the internet, adding HTTPS-encryption is mandatory! See below for more information.
+
+## Base version - apache
+This version will use the apache image and add a mariaDB container. The volumes are set to keep your data persistent. This setup provides **no ssl encryption** and is intended to run behind a proxy.
+
+Make sure to pass in values for `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` variables before you run this setup.
+
+```yaml
+version: '2'
+
+volumes:
+ nextcloud:
+ db:
+
+services:
+ db:
+ image: mariadb
+ command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+ restart: always
+ volumes:
+ - db:/var/lib/mysql
+ environment:
+ - MYSQL_ROOT_PASSWORD=
+ - MYSQL_PASSWORD=
+ - MYSQL_DATABASE=nextcloud
+ - MYSQL_USER=nextcloud
+
+ app:
+ image: nextcloud
+ ports:
+ - 8080:80
+ links:
+ - db
+ volumes:
+ - nextcloud:/var/www/html
+ restart: always
+
+```
+
+Then run `docker-compose up -d`, now you can access Nextcloud at http://localhost:8080/ from your host system.
+
+## Base version - FPM
+When using the FPM image, you need another container that acts as web server on port 80 and proxies the requests to the Nextcloud container. In this example a simple nginx container is combined with the Nextcloud-fpm image and a MariaDB database container. The data is stored in docker volumes. The nginx container also needs access to static files from your Nextcloud installation. It gets access to all the volumes mounted to Nextcloud via the `volumes_from` option.The configuration for nginx is stored in the configuration file `nginx.conf`, that is mounted into the container. An example can be found in the examples section [here](https://github.com/nextcloud/docker/tree/master/.examples).
+
+As this setup does **not include encryption**, it should be run behind a proxy.
+
+Make sure to pass in values for `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` variables before you run this setup.
+
+```yaml
+version: '2'
+
+volumes:
+ nextcloud:
+ db:
+
+services:
+ db:
+ image: mariadb
+ command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+ restart: always
+ volumes:
+ - db:/var/lib/mysql
+ environment:
+ - MYSQL_ROOT_PASSWORD=
+ - MYSQL_PASSWORD=
+ - MYSQL_DATABASE=nextcloud
+ - MYSQL_USER=nextcloud
+
+ app:
+ image: nextcloud:fpm
+ links:
+ - db
+ volumes:
+ - nextcloud:/var/www/html
+ restart: always
+
+ web:
+ image: nginx
+ ports:
+ - 8080:80
+ links:
+ - app
+ volumes:
+ - ./nginx.conf:/etc/nginx/nginx.conf:ro
+ volumes_from:
+ - app
+ restart: always
+```
+
+Then run `docker-compose up -d`, now you can access Nextcloud at http://localhost:8080/ from your host system.
+
+# Docker Secrets
+As an alternative to passing sensitive information via environment variables, _FILE may be appended to the previously listed environment variables, causing the initialization script to load the values for those variables from files present in the container. In particular, this can be used to load passwords from Docker secrets stored in /run/secrets/ files. For example:
+```yaml
+version: '3.2'
+
+services:
+ db:
+ image: postgres
+ restart: always
+ volumes:
+ - db:/var/lib/postgresql/data
+ environment:
+ - POSTGRES_DB_FILE=/run/secrets/postgres_db
+ - POSTGRES_USER_FILE=/run/secrets/postgres_user
+ - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
+ secrets:
+ - postgres_db
+ - postgres_password
+ - postgres_user
+
+ app:
+ image: nextcloud
+ restart: always
+ ports:
+ - 8080:80
+ volumes:
+ - nextcloud:/var/www/html
+ environment:
+ - POSTGRES_HOST=db
+ - POSTGRES_DB_FILE=/run/secrets/postgres_db
+ - POSTGRES_USER_FILE=/run/secrets/postgres_user
+ - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
+ - NEXTCLOUD_ADMIN_PASSWORD_FILE=/run/secrets/nextcloud_admin_password
+ - NEXTCLOUD_ADMIN_USER_FILE=/run/secrets/nextcloud_admin_user
+ depends_on:
+ - db
+ secrets:
+ - nextcloud_admin_password
+ - nextcloud_admin_user
+ - postgres_db
+ - postgres_password
+ - postgres_user
+
+volumes:
+ db:
+ nextcloud:
+
+secrets:
+ nextcloud_admin_password:
+ file: ./nextcloud_admin_password.txt # put admin password to this file
+ nextcloud_admin_user:
+ file: ./nextcloud_admin_user.txt # put admin username to this file
+ postgres_db:
+ file: ./postgres_db.txt # put postgresql db name to this file
+ postgres_password:
+ file: ./postgres_password.txt # put postgresql password to this file
+ postgres_user:
+ file: ./postgres_user.txt # put postgresql username to this file
+```
+
+Currently, this is only supported for `NEXTCLOUD_ADMIN_PASSWORD`, `NEXTCLOUD_ADMIN_USER`, `MYSQL_DB`, `MYSQL_PASSWORD`, `MYSQL_USER`, `POSTGRES_DB`, `POSTGRES_PASSWORD`, `POSTGRES_USER`.
+
+# Make your Nextcloud available from the internet
+Until here, your Nextcloud is just available from you docker host. If you want your Nextcloud available from the internet adding SSL encryption is mandatory.
+
+## HTTPS - SSL encryption
+There are many different possibilities to introduce encryption depending on your setup.
+
+We recommend using a reverse proxy in front of our Nextcloud installation. Your Nextcloud will only be reachable through the proxy, which encrypts all traffic to the clients. You can mount your manually generated certificates to the proxy or use a fully automated solution which generates and renews the certificates for you.
+
+In our [examples](https://github.com/nextcloud/docker/tree/master/.examples) section we have an example for a fully automated setup using a reverse proxy, a container for [Let's Encrypt](https://letsencrypt.org/) certificate handling, database and Nextcloud. It uses the popular [nginx-proxy](https://github.com/jwilder/nginx-proxy) and [docker-letsencrypt-nginx-proxy-companion](https://github.com/JrCs/docker-letsencrypt-nginx-proxy-companion) containers. Please check the according documentations before using this setup.
+
+# First use
+When you first access your Nextcloud, the setup wizard will appear and ask you to choose an administrator account username, password and the database connection. For the database use `db` as host and `nextcloud` as table and user name. Also enter the password you chose in your `docker-compose.yml` file.
+
+# Update to a newer version
+Updating the Nextcloud container is done by pulling the new image, throwing away the old container and starting the new one.
+
+**It is only possible to upgrade one major version at a time. For example, if you want to upgrade from version 14 to 16, you will have to upgrade from version 14 to 15, then from 15 to 16.**
+
+Since all data is stored in volumes, nothing gets lost. The startup script will check for the version in your volume and the installed docker version. If it finds a mismatch, it automatically starts the upgrade process. Don't forget to add all the volumes to your new container, so it works as expected.
+
+```console
+$ docker pull nextcloud
+$ docker stop
+$ docker rm
+$ docker run -d nextcloud
+```
+Beware that you have to run the same command with the options that you used to initially start your Nextcloud. That includes volumes, port mapping.
+
+When using docker-compose your compose file takes care of your configuration, so you just have to run:
+
+```console
+$ docker-compose pull
+$ docker-compose up -d
+```
+
+
+# Adding Features
+A lot of people want to use additional functionality inside their Nextcloud installation. If the image does not include the packages you need, you can easily build your own image on top of it.
+Start your derived image with the `FROM` statement and add whatever you like.
+
+```yaml
+FROM nextcloud:apache
+
+RUN ...
+
+```
+The [examples folder](https://github.com/nextcloud/docker/blob/master/.examples) gives a few examples on how to add certain functionalities, like including the cron job, smb-support or imap-authentication.
+
+If you use your own Dockerfile, you need to configure your docker-compose file accordingly. Switch out the `image` option with `build`. You have to specify the path to your Dockerfile. (in the example it's in the same directory next to the docker-compose file)
+
+```yaml
+ app:
+ build: .
+ links:
+ - db
+ volumes:
+ - data:/var/www/html/data
+ - config:/var/www/html/config
+ - apps:/var/www/html/apps
+ restart: always
+```
+
+If you intend to use another command to run the image, make sure that you set `NEXTCLOUD_UPDATE=1` in your Dockerfile. Otherwise the installation and update will not work.
+
+```yaml
+FROM nextcloud:apache
+
+...
+
+ENV NEXTCLOUD_UPDATE=1
+
+CMD ["/usr/bin/supervisord"]
+```
+
+
+**Updating** your own derived image is also very simple. When a new version of the Nextcloud image is available run:
+
+```console
+docker build -t your-name --pull .
+docker run -d your-name
+```
+
+or for docker-compose:
+```console
+docker-compose build --pull
+docker-compose up -d
+```
+
+The `--pull` option tells docker to look for new versions of the base image. Then the build instructions inside your `Dockerfile` are run on top of the new image.
+
+# Migrating an existing installation
+You're already using Nextcloud and want to switch to docker? Great! Here are some things to look out for:
+
+1. Define your whole Nextcloud infrastructure in a `docker-compose` file and run it with `docker-compose up -d` to get the base installation, volumes and database. Work from there.
+2. Restore your database from a mysqldump (nextcloud\_db\_1 is the name of your db container)
+ - To import from a MySQL dump use the following commands
+ ```console
+ docker cp ./database.dmp nextcloud_db_1:/dmp
+ docker-compose exec db sh -c "mysql -u USER -pPASSWORD nextcloud < /dmp"
+ docker-compose exec db rm /dmp
+ ```
+ - To import from a PostgreSQL dump use to following commands
+ ```console
+ docker cp ./database.dmp nextcloud_db_1:/dmp
+ docker-compose exec db sh -c "psql -U USER --set ON_ERROR_STOP=on nextcloud < /dmp"
+ docker-compose exec db rm /dmp
+ ```
+3. Edit your config.php
+ 1. Set database connection
+ - In case of MySQL database
+ ```php
+ 'dbhost' => 'db:3306',
+ ```
+ - In case of PostgreSQL database
+ ```php
+ 'dbhost' => 'db:5432',
+ ```
+ 2. Make sure you have no configuration for the `apps_paths`. Delete lines like these
+ ```diff
+ - "apps_paths" => array (
+ - 0 => array (
+ - "path" => OC::$SERVERROOT."/apps",
+ - "url" => "/apps",
+ - "writable" => true,
+ - ),
+ ```
+ 3. Make sure to have the `apps` directory non writable and the `custom_apps` directory writable
+ ```php
+ 'apps_paths' => array (
+ 0 => array (
+ 'path' => '/var/www/html/apps',
+ 'url' => '/apps',
+ 'writable' => false,
+ ),
+ 1 => array (
+ 'path' => '/var/www/html/custom_apps',
+ 'url' => '/custom_apps',
+ 'writable' => true,
+ ),
+ ),
+ ```
+ 4. Make sure your data directory is set to /var/www/html/data
+ ```php
+ 'datadirectory' => '/var/www/html/data',
+ ```
+
+
+4. Copy your data (nextcloud_app_1 is the name of your Nextcloud container):
+```console
+docker cp ./data/ nextcloud_app_1:/var/www/html/
+docker-compose exec app chown -R www-data:www-data /var/www/html/data
+docker cp ./theming/ nextcloud_app_1:/var/www/html/
+docker-compose exec app chown -R www-data:www-data /var/www/html/theming
+docker cp ./config/config.php nextcloud_app_1:/var/www/html/config
+docker-compose exec app chown -R www-data:www-data /var/www/html/config
+```
+5. Copy only the custom apps you use (or simply redownload them from the web interface):
+```console
+docker cp ./custom_apps/ nextcloud_data:/var/www/html/
+docker-compose exec app chown -R www-data:www-data /var/www/html/custom_apps
+```
+
+# Questions / Issues
+If you got any questions or problems using the image, please visit our [Github Repository](https://github.com/nextcloud/docker) and write an issue.
diff --git a/linux/advanced/nextcloud/pure/19/docker-compose.yml b/linux/advanced/nextcloud/pure/19/docker-compose.yml
new file mode 100644
index 000000000..53429226d
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/19/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+ app:
+ image: "epicmorg/nextcloud:19"
+ build:
+ context: .
diff --git a/linux/nextcloud/19/smb.conf b/linux/advanced/nextcloud/pure/19/smb.conf
similarity index 100%
rename from linux/nextcloud/19/smb.conf
rename to linux/advanced/nextcloud/pure/19/smb.conf
diff --git a/linux/advanced/nextcloud/pure/19/sources.list b/linux/advanced/nextcloud/pure/19/sources.list
new file mode 100644
index 000000000..5a8c0081a
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/19/sources.list
@@ -0,0 +1,21 @@
+#main
+deb http://httpredir.debian.org/debian/ bullseye main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye main contrib non-free
+deb http://httpredir.debian.org/debian/ bullseye-updates main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye-updates main contrib non-free
+deb http://httpredir.debian.org/debian/ bullseye-backports main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye-backports main contrib non-free
+deb http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib non-free
+
+#security
+deb http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free
+deb-src http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free
+deb http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free
+deb-src http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free
+
+##multimedia
+# deb http://httpredir.debian.org/debian-multimedia/ bullseye main non-free
+# deb-src http://httpredir.debian.org/debian-multimedia/ bullseye main non-free
+# deb http://httpredir.debian.org/debian-multimedia/ bullseye-backports main
+# deb-src http://httpredir.debian.org/debian-multimedia/ bullseye-backports main
diff --git a/linux/advanced/nextcloud/pure/20/Dockerfile b/linux/advanced/nextcloud/pure/20/Dockerfile
new file mode 100644
index 000000000..911405757
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/20/Dockerfile
@@ -0,0 +1,68 @@
+FROM nextcloud:20
+ENV DEBIAN_FRONTEND noninteractive
+
+##################################################################
+# adding normal sources list
+##################################################################
+RUN rm /etc/apt/sources.list
+COPY sources.list /etc/apt/sources.list
+
+##################################################################
+# adding some utils
+##################################################################
+RUN apt update -y && \
+ apt dist-upgrade -y && \
+ apt install -y --allow-unauthenticated \
+ apt-transport-https \
+ curl \
+ ca-certificates \
+ ghostscript \
+ nload \
+ htop \
+ mc \
+ nano \
+ sudo \
+ imagemagick \
+ imagemagick-common \
+ sqlite3 \
+ smbclient \
+ libsmbclient \
+ wget \
+ net-tools \
+ iputils-ping
+
+
+##################################################################
+# installing php repo + smbclient
+##################################################################
+RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
+RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list'
+RUN apt update -y && \
+ apt install -y --allow-unauthenticated \
+ libsmbclient-dev \
+ libmagickwand-dev \
+ libmagickcore-dev \
+ libc-client-dev \
+ libkrb5-dev \
+ libsqlite3-dev \
+ libssl-dev
+
+RUN pecl install inotify && \
+ docker-php-ext-enable inotify
+
+RUN pecl install smbclient && \
+ docker-php-ext-enable smbclient
+
+RUN docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
+ docker-php-ext-install imap && \
+ docker-php-ext-enable imap
+
+RUN docker-php-ext-install fileinfo bz2 intl ftp pdo_sqlite && \
+ docker-php-ext-enable fileinfo bz2 intl ftp pdo_sqlite
+
+##################################################################
+# smb fix
+##################################################################
+RUN rm -frv /etc/samba/smb.conf /usr/share/samba/smb.conf
+ADD smb.conf /etc/samba/
+ADD smb.conf /usr/share/samba/
diff --git a/linux/advanced/nextcloud/pure/20/Makefile b/linux/advanced/nextcloud/pure/20/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/20/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+ make build
+ make deploy
+ make clean
+
+build:
+ docker-compose build --compress --parallel
+
+deploy:
+ docker-compose push
+
+clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
diff --git a/linux/advanced/nextcloud/pure/20/README.md b/linux/advanced/nextcloud/pure/20/README.md
new file mode 100644
index 000000000..b6df71808
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/20/README.md
@@ -0,0 +1,527 @@
+# What is Nextcloud?
+
+[](https://github.com/nextcloud/docker/actions?query=workflow%3AImages)
+[](https://github.com/nextcloud/docker/actions?query=workflow%3Aupdate.sh)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/i386/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/mips64le/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/s390x/job/nextcloud)
+
+A safe home for all your data. Access & share your files, calendars, contacts, mail & more from any device, on your terms.
+
+
+
+# How to use this image
+This image is designed to be used in a micro-service environment. There are two versions of the image you can choose from.
+
+The `apache` tag contains a full Nextcloud installation including an apache web server. It is designed to be easy to use and gets you running pretty fast. This is also the default for the `latest` tag and version tags that are not further specified.
+
+The second option is a `fpm` container. It is based on the [php-fpm](https://hub.docker.com/_/php/) image and runs a fastCGI-Process that serves your Nextcloud page. To use this image it must be combined with any webserver that can proxy the http requests to the FastCGI-port of the container.
+
+[](http://play-with-docker.com?stack=https://raw.githubusercontent.com/nextcloud/docker/8db861d67f257a3e9ac1790ea06d4e2a7a193a6c/stack.yml)
+
+## Using the apache image
+The apache image contains a webserver and exposes port 80. To start the container type:
+
+```console
+$ docker run -d -p 8080:80 nextcloud
+```
+
+Now you can access Nextcloud at http://localhost:8080/ from your host system.
+
+
+## Using the fpm image
+To use the fpm image, you need an additional web server that can proxy http-request to the fpm-port of the container. For fpm connection this container exposes port 9000. In most cases, you might want use another container or your host as proxy.
+If you use your host you can address your Nextcloud container directly on port 9000. If you use another container, make sure that you add them to the same docker network (via `docker run --network ...` or a `docker-compose` file).
+In both cases you don't want to map the fpm port to your host.
+
+```console
+$ docker run -d nextcloud:fpm
+```
+
+As the fastCGI-Process is not capable of serving static files (style sheets, images, ...), the webserver needs access to these files. This can be achieved with the `volumes-from` option. You can find more information in the [docker-compose section](#running-this-image-with-docker-compose).
+
+## Using an external database
+By default, this container uses SQLite for data storage but the Nextcloud setup wizard (appears on first run) allows connecting to an existing MySQL/MariaDB or PostgreSQL database. You can also link a database container, e. g. `--link my-mysql:mysql`, and then use `mysql` as the database host on setup. More info is in the docker-compose section.
+
+## Persistent data
+The Nextcloud installation and all data beyond what lives in the database (file uploads, etc) are stored in the [unnamed docker volume](https://docs.docker.com/engine/tutorials/dockervolumes/#adding-a-data-volume) volume `/var/www/html`. The docker daemon will store that data within the docker directory `/var/lib/docker/volumes/...`. That means your data is saved even if the container crashes, is stopped or deleted.
+
+A named Docker volume or a mounted host directory should be used for upgrades and backups. To achieve this, you need one volume for your database container and one for Nextcloud.
+
+Nextcloud:
+- `/var/www/html/` folder where all nextcloud data lives
+```console
+$ docker run -d \
+-v nextcloud:/var/www/html \
+nextcloud
+```
+
+Database:
+- `/var/lib/mysql` MySQL / MariaDB Data
+- `/var/lib/postgresql/data` PostgreSQL Data
+```console
+$ docker run -d \
+-v db:/var/lib/mysql \
+mariadb
+```
+
+If you want to get fine grained access to your individual files, you can mount additional volumes for data, config, your theme and custom apps.
+The `data`, `config` files are stored in respective subfolders inside `/var/www/html/`. The apps are split into core `apps` (which are shipped with Nextcloud and you don't need to take care of) and a `custom_apps` folder. If you use a custom theme it would go into the `themes` subfolder.
+
+Overview of the folders that can be mounted as volumes:
+
+- `/var/www/html` Main folder, needed for updating
+- `/var/www/html/custom_apps` installed / modified apps
+- `/var/www/html/config` local configuration
+- `/var/www/html/data` the actual data of your Nextcloud
+- `/var/www/html/themes/` theming/branding
+
+If you want to use named volumes for all of these, it would look like this:
+```console
+$ docker run -d \
+-v nextcloud:/var/www/html \
+-v apps:/var/www/html/custom_apps \
+-v config:/var/www/html/config \
+-v data:/var/www/html/data \
+-v theme:/var/www/html/themes/ \
+nextcloud
+```
+
+## Using the Nextcloud command-line interface
+To use the [Nextcloud command-line interface](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/occ_command.html) (aka. `occ` command):
+```console
+$ docker exec --user www-data CONTAINER_ID php occ
+```
+or for docker-compose:
+```console
+$ docker-compose exec --user www-data app php occ
+```
+
+## Auto configuration via environment variables
+The nextcloud image supports auto configuration via environment variables. You can preconfigure everything that is asked on the install page on first run. To enable auto configuration, set your database connection via the following environment variables. ONLY use one database type!
+
+__SQLite__:
+- `SQLITE_DATABASE` Name of the database using sqlite
+
+__MYSQL/MariaDB__:
+- `MYSQL_DATABASE` Name of the database using mysql / mariadb.
+- `MYSQL_USER` Username for the database using mysql / mariadb.
+- `MYSQL_PASSWORD` Password for the database user using mysql / mariadb.
+- `MYSQL_HOST` Hostname of the database server using mysql / mariadb.
+
+__PostgreSQL__:
+- `POSTGRES_DB` Name of the database using postgres.
+- `POSTGRES_USER` Username for the database using postgres.
+- `POSTGRES_PASSWORD` Password for the database user using postgres.
+- `POSTGRES_HOST` Hostname of the database server using postgres.
+
+If you set any values, they will not be asked in the install page on first run. With a complete configuration by using all variables for your database type, you can additionally configure your Nextcloud instance by setting admin user and password (only works if you set both):
+
+- `NEXTCLOUD_ADMIN_USER` Name of the Nextcloud admin user.
+- `NEXTCLOUD_ADMIN_PASSWORD` Password for the Nextcloud admin user.
+
+If you want, you can set the data directory, otherwise default value will be used.
+
+- `NEXTCLOUD_DATA_DIR` (default: _/var/www/html/data_) Configures the data directory where nextcloud stores all files from the users.
+
+One or more trusted domains can be set through environment variable, too. They will be added to the configuration after install.
+
+- `NEXTCLOUD_TRUSTED_DOMAINS` (not set by default) Optional space-separated list of domains
+
+The install and update script is only triggered when a default command is used (`apache-foreground` or `php-fpm`). If you use a custom command you have to enable the install / update with
+
+- `NEXTCLOUD_UPDATE` (default: _0_)
+
+If you want to use Redis you have to create a separate [Redis](https://hub.docker.com/_/redis/) container in your setup / in your docker-compose file. To inform Nextcloud about the Redis container, pass in the following parameters:
+
+- `REDIS_HOST` (not set by default) Name of Redis container
+- `REDIS_HOST_PORT` (default: _6379_) Optional port for Redis, only use for external Redis servers that run on non-standard ports.
+- `REDIS_HOST_PASSWORD` (not set by default) Redis password
+
+The use of Redis is recommended to prevent file locking problems. See the examples for further instructions.
+
+To use an external SMTP server, you have to provide the connection details. To configure Nextcloud to use SMTP add:
+
+- `SMTP_HOST` (not set by default): The hostname of the SMTP server.
+- `SMTP_SECURE` (empty by default): Set to `ssl` to use SSL, or `tls` to use STARTTLS.
+- `SMTP_PORT` (default: `465` for SSL and `25` for non-secure connections): Optional port for the SMTP connection. Use `587` for an alternative port for STARTTLS.
+- `SMTP_AUTHTYPE` (default: `LOGIN`): The method used for authentication. Use `PLAIN` if no authentication is required.
+- `SMTP_NAME` (empty by default): The username for the authentication.
+- `SMTP_PASSWORD` (empty by default): The password for the authentication.
+- `MAIL_FROM_ADDRESS` (not set by default): Use this address for the 'from' field in the emails sent by Nextcloud.
+- `MAIL_DOMAIN` (not set by default): Set a different domain for the emails than the domain where Nextcloud is installed.
+
+Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/email_configuration.html) for other values to configure SMTP.
+
+To use an external S3 compatible object store as primary storage, set the following variables:
+- `OBJECTSTORE_S3_HOST`: The hostname of the object storage server
+- `OBJECTSTORE_S3_BUCKET`: The name of the bucket that Nextcloud should store the data in
+- `OBJECTSTORE_S3_KEY`: AWS style access key
+- `OBJECTSTORE_S3_SECRET`: AWS style secret access key
+- `OBJECTSTORE_S3_PORT`: The port that the object storage server is being served over
+- `OBJECTSTORE_S3_SSL` (default: `true`): Whether or not SSL/TLS should be used to communicate with object storage server
+- `OBJECTSTORE_S3_REGION`: The region that the S3 bucket resides in.
+- `OBJECTSTORE_S3_USEPATH_STYLE` (default: `false`): Not required for AWS S3
+
+Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/primary_storage.html#simple-storage-service-s3) for more information.
+
+To use an external OpenStack Swift object store as primary storage, set the following variables:
+- `OBJECTSTORE_SWIFT_URL`: The Swift identity (Keystone) endpoint
+- `OBJECTSTORE_SWIFT_AUTOCREATE` (default: `false`): Whether or not Nextcloud should automatically create the Swift container
+- `OBJECTSTORE_SWIFT_USER_NAME`: Swift username
+- `OBJECTSTORE_SWIFT_USER_PASSWORD`: Swift user password
+- `OBJECTSTORE_SWIFT_USER_DOMAIN` (default: `Default`): Swift user domain
+- `OBJECTSTORE_SWIFT_PROJECT_NAME`: OpenStack project name
+- `OBJECTSTORE_SWIFT_PROJECT_DOMAIN` (default: `Default`): OpenStack project domain
+- `OBJECTSTORE_SWIFT_SERVICE_NAME` (default: `swift`): Swift service name
+- `OBJECTSTORE_SWIFT_SERVICE_REGION`: Swift endpoint region
+- `OBJECTSTORE_SWIFT_CONTAINER_NAME`: Swift container (bucket) that Nextcloud should store the data in
+
+Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/primary_storage.html#openstack-swift) for more information.
+
+
+## Using the apache image behind a reverse proxy and auto configure server host and protocol
+
+The apache image will replace the remote addr (ip address visible to Nextcloud) with the ip address from `X-Real-IP` if the request is coming from a proxy in 10.0.0.0/8, 172.16.0.0/12 or 192.168.0.0/16 by default. If you want Nextcloud to pick up the server host (`HTTP_X_FORWARDED_HOST`), protocol (`HTTP_X_FORWARDED_PROTO`) and client ip (`HTTP_X_FORWARDED_FOR`) from a trusted proxy disable rewrite ip and the reverse proxies ip address to `TRUSTED_PROXIES`.
+
+- `APACHE_DISABLE_REWRITE_IP` (not set by default): Set to 1 to disable rewrite ip.
+
+- `TRUSTED_PROXIES` (empty by default): A space-separated list of trusted proxies. CIDR notation is supported for IPv4.
+
+If the `TRUSTED_PROXIES` approach does not work for you, try using fixed values for overwrite parameters.
+
+- `OVERWRITEHOST` (empty by default): Set the hostname of the proxy. Can also specify a port.
+- `OVERWRITEPROTOCOL` (empty by default): Set the protocol of the proxy, http or https.
+- `OVERWRITEWEBROOT` (empty by default): Set the absolute path of the proxy.
+- `OVERWRITECONDADDR` (empty by default): Regex to overwrite the values dependent on the remote address.
+
+Check the [Nexcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/reverse_proxy_configuration.html) for more details.
+
+Keep in mind that once set, removing these environment variables won't remove these values from the configuration file, due to how Nextcloud merges configuration files together.
+
+# Running this image with docker-compose
+The easiest way to get a fully featured and functional setup is using a `docker-compose` file. There are too many different possibilities to setup your system, so here are only some examples of what you have to look for.
+
+At first, make sure you have chosen the right base image (fpm or apache) and added features you wanted (see below). In every case, you would want to add a database container and docker volumes to get easy access to your persistent data. When you want to have your server reachable from the internet, adding HTTPS-encryption is mandatory! See below for more information.
+
+## Base version - apache
+This version will use the apache image and add a mariaDB container. The volumes are set to keep your data persistent. This setup provides **no ssl encryption** and is intended to run behind a proxy.
+
+Make sure to pass in values for `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` variables before you run this setup.
+
+```yaml
+version: '2'
+
+volumes:
+ nextcloud:
+ db:
+
+services:
+ db:
+ image: mariadb
+ command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+ restart: always
+ volumes:
+ - db:/var/lib/mysql
+ environment:
+ - MYSQL_ROOT_PASSWORD=
+ - MYSQL_PASSWORD=
+ - MYSQL_DATABASE=nextcloud
+ - MYSQL_USER=nextcloud
+
+ app:
+ image: nextcloud
+ ports:
+ - 8080:80
+ links:
+ - db
+ volumes:
+ - nextcloud:/var/www/html
+ restart: always
+
+```
+
+Then run `docker-compose up -d`, now you can access Nextcloud at http://localhost:8080/ from your host system.
+
+## Base version - FPM
+When using the FPM image, you need another container that acts as web server on port 80 and proxies the requests to the Nextcloud container. In this example a simple nginx container is combined with the Nextcloud-fpm image and a MariaDB database container. The data is stored in docker volumes. The nginx container also needs access to static files from your Nextcloud installation. It gets access to all the volumes mounted to Nextcloud via the `volumes_from` option.The configuration for nginx is stored in the configuration file `nginx.conf`, that is mounted into the container. An example can be found in the examples section [here](https://github.com/nextcloud/docker/tree/master/.examples).
+
+As this setup does **not include encryption**, it should be run behind a proxy.
+
+Make sure to pass in values for `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` variables before you run this setup.
+
+```yaml
+version: '2'
+
+volumes:
+ nextcloud:
+ db:
+
+services:
+ db:
+ image: mariadb
+ command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+ restart: always
+ volumes:
+ - db:/var/lib/mysql
+ environment:
+ - MYSQL_ROOT_PASSWORD=
+ - MYSQL_PASSWORD=
+ - MYSQL_DATABASE=nextcloud
+ - MYSQL_USER=nextcloud
+
+ app:
+ image: nextcloud:fpm
+ links:
+ - db
+ volumes:
+ - nextcloud:/var/www/html
+ restart: always
+
+ web:
+ image: nginx
+ ports:
+ - 8080:80
+ links:
+ - app
+ volumes:
+ - ./nginx.conf:/etc/nginx/nginx.conf:ro
+ volumes_from:
+ - app
+ restart: always
+```
+
+Then run `docker-compose up -d`, now you can access Nextcloud at http://localhost:8080/ from your host system.
+
+# Docker Secrets
+As an alternative to passing sensitive information via environment variables, _FILE may be appended to the previously listed environment variables, causing the initialization script to load the values for those variables from files present in the container. In particular, this can be used to load passwords from Docker secrets stored in /run/secrets/ files. For example:
+```yaml
+version: '3.2'
+
+services:
+ db:
+ image: postgres
+ restart: always
+ volumes:
+ - db:/var/lib/postgresql/data
+ environment:
+ - POSTGRES_DB_FILE=/run/secrets/postgres_db
+ - POSTGRES_USER_FILE=/run/secrets/postgres_user
+ - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
+ secrets:
+ - postgres_db
+ - postgres_password
+ - postgres_user
+
+ app:
+ image: nextcloud
+ restart: always
+ ports:
+ - 8080:80
+ volumes:
+ - nextcloud:/var/www/html
+ environment:
+ - POSTGRES_HOST=db
+ - POSTGRES_DB_FILE=/run/secrets/postgres_db
+ - POSTGRES_USER_FILE=/run/secrets/postgres_user
+ - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
+ - NEXTCLOUD_ADMIN_PASSWORD_FILE=/run/secrets/nextcloud_admin_password
+ - NEXTCLOUD_ADMIN_USER_FILE=/run/secrets/nextcloud_admin_user
+ depends_on:
+ - db
+ secrets:
+ - nextcloud_admin_password
+ - nextcloud_admin_user
+ - postgres_db
+ - postgres_password
+ - postgres_user
+
+volumes:
+ db:
+ nextcloud:
+
+secrets:
+ nextcloud_admin_password:
+ file: ./nextcloud_admin_password.txt # put admin password to this file
+ nextcloud_admin_user:
+ file: ./nextcloud_admin_user.txt # put admin username to this file
+ postgres_db:
+ file: ./postgres_db.txt # put postgresql db name to this file
+ postgres_password:
+ file: ./postgres_password.txt # put postgresql password to this file
+ postgres_user:
+ file: ./postgres_user.txt # put postgresql username to this file
+```
+
+Currently, this is only supported for `NEXTCLOUD_ADMIN_PASSWORD`, `NEXTCLOUD_ADMIN_USER`, `MYSQL_DB`, `MYSQL_PASSWORD`, `MYSQL_USER`, `POSTGRES_DB`, `POSTGRES_PASSWORD`, `POSTGRES_USER`.
+
+# Make your Nextcloud available from the internet
+Until here, your Nextcloud is just available from you docker host. If you want your Nextcloud available from the internet adding SSL encryption is mandatory.
+
+## HTTPS - SSL encryption
+There are many different possibilities to introduce encryption depending on your setup.
+
+We recommend using a reverse proxy in front of our Nextcloud installation. Your Nextcloud will only be reachable through the proxy, which encrypts all traffic to the clients. You can mount your manually generated certificates to the proxy or use a fully automated solution which generates and renews the certificates for you.
+
+In our [examples](https://github.com/nextcloud/docker/tree/master/.examples) section we have an example for a fully automated setup using a reverse proxy, a container for [Let's Encrypt](https://letsencrypt.org/) certificate handling, database and Nextcloud. It uses the popular [nginx-proxy](https://github.com/jwilder/nginx-proxy) and [docker-letsencrypt-nginx-proxy-companion](https://github.com/JrCs/docker-letsencrypt-nginx-proxy-companion) containers. Please check the according documentations before using this setup.
+
+# First use
+When you first access your Nextcloud, the setup wizard will appear and ask you to choose an administrator account username, password and the database connection. For the database use `db` as host and `nextcloud` as table and user name. Also enter the password you chose in your `docker-compose.yml` file.
+
+# Update to a newer version
+Updating the Nextcloud container is done by pulling the new image, throwing away the old container and starting the new one.
+
+**It is only possible to upgrade one major version at a time. For example, if you want to upgrade from version 14 to 16, you will have to upgrade from version 14 to 15, then from 15 to 16.**
+
+Since all data is stored in volumes, nothing gets lost. The startup script will check for the version in your volume and the installed docker version. If it finds a mismatch, it automatically starts the upgrade process. Don't forget to add all the volumes to your new container, so it works as expected.
+
+```console
+$ docker pull nextcloud
+$ docker stop
+$ docker rm
+$ docker run -d nextcloud
+```
+Beware that you have to run the same command with the options that you used to initially start your Nextcloud. That includes volumes, port mapping.
+
+When using docker-compose your compose file takes care of your configuration, so you just have to run:
+
+```console
+$ docker-compose pull
+$ docker-compose up -d
+```
+
+
+# Adding Features
+A lot of people want to use additional functionality inside their Nextcloud installation. If the image does not include the packages you need, you can easily build your own image on top of it.
+Start your derived image with the `FROM` statement and add whatever you like.
+
+```yaml
+FROM nextcloud:apache
+
+RUN ...
+
+```
+The [examples folder](https://github.com/nextcloud/docker/blob/master/.examples) gives a few examples on how to add certain functionalities, like including the cron job, smb-support or imap-authentication.
+
+If you use your own Dockerfile, you need to configure your docker-compose file accordingly. Switch out the `image` option with `build`. You have to specify the path to your Dockerfile. (in the example it's in the same directory next to the docker-compose file)
+
+```yaml
+ app:
+ build: .
+ links:
+ - db
+ volumes:
+ - data:/var/www/html/data
+ - config:/var/www/html/config
+ - apps:/var/www/html/apps
+ restart: always
+```
+
+If you intend to use another command to run the image, make sure that you set `NEXTCLOUD_UPDATE=1` in your Dockerfile. Otherwise the installation and update will not work.
+
+```yaml
+FROM nextcloud:apache
+
+...
+
+ENV NEXTCLOUD_UPDATE=1
+
+CMD ["/usr/bin/supervisord"]
+```
+
+
+**Updating** your own derived image is also very simple. When a new version of the Nextcloud image is available run:
+
+```console
+docker build -t your-name --pull .
+docker run -d your-name
+```
+
+or for docker-compose:
+```console
+docker-compose build --pull
+docker-compose up -d
+```
+
+The `--pull` option tells docker to look for new versions of the base image. Then the build instructions inside your `Dockerfile` are run on top of the new image.
+
+# Migrating an existing installation
+You're already using Nextcloud and want to switch to docker? Great! Here are some things to look out for:
+
+1. Define your whole Nextcloud infrastructure in a `docker-compose` file and run it with `docker-compose up -d` to get the base installation, volumes and database. Work from there.
+2. Restore your database from a mysqldump (nextcloud\_db\_1 is the name of your db container)
+ - To import from a MySQL dump use the following commands
+ ```console
+ docker cp ./database.dmp nextcloud_db_1:/dmp
+ docker-compose exec db sh -c "mysql -u USER -pPASSWORD nextcloud < /dmp"
+ docker-compose exec db rm /dmp
+ ```
+ - To import from a PostgreSQL dump use to following commands
+ ```console
+ docker cp ./database.dmp nextcloud_db_1:/dmp
+ docker-compose exec db sh -c "psql -U USER --set ON_ERROR_STOP=on nextcloud < /dmp"
+ docker-compose exec db rm /dmp
+ ```
+3. Edit your config.php
+ 1. Set database connection
+ - In case of MySQL database
+ ```php
+ 'dbhost' => 'db:3306',
+ ```
+ - In case of PostgreSQL database
+ ```php
+ 'dbhost' => 'db:5432',
+ ```
+ 2. Make sure you have no configuration for the `apps_paths`. Delete lines like these
+ ```diff
+ - "apps_paths" => array (
+ - 0 => array (
+ - "path" => OC::$SERVERROOT."/apps",
+ - "url" => "/apps",
+ - "writable" => true,
+ - ),
+ ```
+ 3. Make sure to have the `apps` directory non writable and the `custom_apps` directory writable
+ ```php
+ 'apps_paths' => array (
+ 0 => array (
+ 'path' => '/var/www/html/apps',
+ 'url' => '/apps',
+ 'writable' => false,
+ ),
+ 1 => array (
+ 'path' => '/var/www/html/custom_apps',
+ 'url' => '/custom_apps',
+ 'writable' => true,
+ ),
+ ),
+ ```
+ 4. Make sure your data directory is set to /var/www/html/data
+ ```php
+ 'datadirectory' => '/var/www/html/data',
+ ```
+
+
+4. Copy your data (nextcloud_app_1 is the name of your Nextcloud container):
+```console
+docker cp ./data/ nextcloud_app_1:/var/www/html/
+docker-compose exec app chown -R www-data:www-data /var/www/html/data
+docker cp ./theming/ nextcloud_app_1:/var/www/html/
+docker-compose exec app chown -R www-data:www-data /var/www/html/theming
+docker cp ./config/config.php nextcloud_app_1:/var/www/html/config
+docker-compose exec app chown -R www-data:www-data /var/www/html/config
+```
+5. Copy only the custom apps you use (or simply redownload them from the web interface):
+```console
+docker cp ./custom_apps/ nextcloud_data:/var/www/html/
+docker-compose exec app chown -R www-data:www-data /var/www/html/custom_apps
+```
+
+# Questions / Issues
+If you got any questions or problems using the image, please visit our [Github Repository](https://github.com/nextcloud/docker) and write an issue.
diff --git a/linux/advanced/nextcloud/pure/20/docker-compose.yml b/linux/advanced/nextcloud/pure/20/docker-compose.yml
new file mode 100644
index 000000000..24f640b6a
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/20/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+ app:
+ image: "epicmorg/nextcloud:20"
+ build:
+ context: .
diff --git a/linux/nextcloud/20/smb.conf b/linux/advanced/nextcloud/pure/20/smb.conf
similarity index 100%
rename from linux/nextcloud/20/smb.conf
rename to linux/advanced/nextcloud/pure/20/smb.conf
diff --git a/linux/advanced/nextcloud/pure/20/sources.list b/linux/advanced/nextcloud/pure/20/sources.list
new file mode 100644
index 000000000..5a8c0081a
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/20/sources.list
@@ -0,0 +1,21 @@
+#main
+deb http://httpredir.debian.org/debian/ bullseye main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye main contrib non-free
+deb http://httpredir.debian.org/debian/ bullseye-updates main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye-updates main contrib non-free
+deb http://httpredir.debian.org/debian/ bullseye-backports main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye-backports main contrib non-free
+deb http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib non-free
+
+#security
+deb http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free
+deb-src http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free
+deb http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free
+deb-src http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free
+
+##multimedia
+# deb http://httpredir.debian.org/debian-multimedia/ bullseye main non-free
+# deb-src http://httpredir.debian.org/debian-multimedia/ bullseye main non-free
+# deb http://httpredir.debian.org/debian-multimedia/ bullseye-backports main
+# deb-src http://httpredir.debian.org/debian-multimedia/ bullseye-backports main
diff --git a/linux/advanced/nextcloud/pure/21/Dockerfile b/linux/advanced/nextcloud/pure/21/Dockerfile
new file mode 100644
index 000000000..487bdf09f
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/21/Dockerfile
@@ -0,0 +1,68 @@
+FROM nextcloud:21
+ENV DEBIAN_FRONTEND noninteractive
+
+##################################################################
+# adding normal sources list
+##################################################################
+RUN rm /etc/apt/sources.list
+COPY sources.list /etc/apt/sources.list
+
+##################################################################
+# adding some utils
+##################################################################
+RUN apt update -y && \
+ apt dist-upgrade -y && \
+ apt install -y --allow-unauthenticated \
+ apt-transport-https \
+ curl \
+ ca-certificates \
+ ghostscript \
+ nload \
+ htop \
+ mc \
+ nano \
+ sudo \
+ imagemagick \
+ imagemagick-common \
+ sqlite3 \
+ smbclient \
+ libsmbclient \
+ wget \
+ net-tools \
+ iputils-ping
+
+
+##################################################################
+# installing php repo + smbclient
+##################################################################
+RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
+RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list'
+RUN apt update -y && \
+ apt install -y --allow-unauthenticated \
+ libsmbclient-dev \
+ libmagickwand-dev \
+ libmagickcore-dev \
+ libc-client-dev \
+ libkrb5-dev \
+ libsqlite3-dev \
+ libssl-dev
+
+RUN pecl install inotify && \
+ docker-php-ext-enable inotify
+
+RUN pecl install smbclient && \
+ docker-php-ext-enable smbclient
+
+RUN docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
+ docker-php-ext-install imap && \
+ docker-php-ext-enable imap
+
+RUN docker-php-ext-install fileinfo bz2 intl ftp pdo_sqlite && \
+ docker-php-ext-enable fileinfo bz2 intl ftp pdo_sqlite
+
+##################################################################
+# smb fix
+##################################################################
+RUN rm -frv /etc/samba/smb.conf /usr/share/samba/smb.conf
+ADD smb.conf /etc/samba/
+ADD smb.conf /usr/share/samba/
diff --git a/linux/advanced/nextcloud/pure/21/Makefile b/linux/advanced/nextcloud/pure/21/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/21/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+ make build
+ make deploy
+ make clean
+
+build:
+ docker-compose build --compress --parallel
+
+deploy:
+ docker-compose push
+
+clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
diff --git a/linux/advanced/nextcloud/pure/21/README.md b/linux/advanced/nextcloud/pure/21/README.md
new file mode 100644
index 000000000..b6df71808
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/21/README.md
@@ -0,0 +1,527 @@
+# What is Nextcloud?
+
+[](https://github.com/nextcloud/docker/actions?query=workflow%3AImages)
+[](https://github.com/nextcloud/docker/actions?query=workflow%3Aupdate.sh)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/i386/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/mips64le/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/s390x/job/nextcloud)
+
+A safe home for all your data. Access & share your files, calendars, contacts, mail & more from any device, on your terms.
+
+
+
+# How to use this image
+This image is designed to be used in a micro-service environment. There are two versions of the image you can choose from.
+
+The `apache` tag contains a full Nextcloud installation including an apache web server. It is designed to be easy to use and gets you running pretty fast. This is also the default for the `latest` tag and version tags that are not further specified.
+
+The second option is a `fpm` container. It is based on the [php-fpm](https://hub.docker.com/_/php/) image and runs a fastCGI-Process that serves your Nextcloud page. To use this image it must be combined with any webserver that can proxy the http requests to the FastCGI-port of the container.
+
+[](http://play-with-docker.com?stack=https://raw.githubusercontent.com/nextcloud/docker/8db861d67f257a3e9ac1790ea06d4e2a7a193a6c/stack.yml)
+
+## Using the apache image
+The apache image contains a webserver and exposes port 80. To start the container type:
+
+```console
+$ docker run -d -p 8080:80 nextcloud
+```
+
+Now you can access Nextcloud at http://localhost:8080/ from your host system.
+
+
+## Using the fpm image
+To use the fpm image, you need an additional web server that can proxy http-request to the fpm-port of the container. For fpm connection this container exposes port 9000. In most cases, you might want use another container or your host as proxy.
+If you use your host you can address your Nextcloud container directly on port 9000. If you use another container, make sure that you add them to the same docker network (via `docker run --network ...` or a `docker-compose` file).
+In both cases you don't want to map the fpm port to your host.
+
+```console
+$ docker run -d nextcloud:fpm
+```
+
+As the fastCGI-Process is not capable of serving static files (style sheets, images, ...), the webserver needs access to these files. This can be achieved with the `volumes-from` option. You can find more information in the [docker-compose section](#running-this-image-with-docker-compose).
+
+## Using an external database
+By default, this container uses SQLite for data storage but the Nextcloud setup wizard (appears on first run) allows connecting to an existing MySQL/MariaDB or PostgreSQL database. You can also link a database container, e. g. `--link my-mysql:mysql`, and then use `mysql` as the database host on setup. More info is in the docker-compose section.
+
+## Persistent data
+The Nextcloud installation and all data beyond what lives in the database (file uploads, etc) are stored in the [unnamed docker volume](https://docs.docker.com/engine/tutorials/dockervolumes/#adding-a-data-volume) volume `/var/www/html`. The docker daemon will store that data within the docker directory `/var/lib/docker/volumes/...`. That means your data is saved even if the container crashes, is stopped or deleted.
+
+A named Docker volume or a mounted host directory should be used for upgrades and backups. To achieve this, you need one volume for your database container and one for Nextcloud.
+
+Nextcloud:
+- `/var/www/html/` folder where all nextcloud data lives
+```console
+$ docker run -d \
+-v nextcloud:/var/www/html \
+nextcloud
+```
+
+Database:
+- `/var/lib/mysql` MySQL / MariaDB Data
+- `/var/lib/postgresql/data` PostgreSQL Data
+```console
+$ docker run -d \
+-v db:/var/lib/mysql \
+mariadb
+```
+
+If you want to get fine grained access to your individual files, you can mount additional volumes for data, config, your theme and custom apps.
+The `data`, `config` files are stored in respective subfolders inside `/var/www/html/`. The apps are split into core `apps` (which are shipped with Nextcloud and you don't need to take care of) and a `custom_apps` folder. If you use a custom theme it would go into the `themes` subfolder.
+
+Overview of the folders that can be mounted as volumes:
+
+- `/var/www/html` Main folder, needed for updating
+- `/var/www/html/custom_apps` installed / modified apps
+- `/var/www/html/config` local configuration
+- `/var/www/html/data` the actual data of your Nextcloud
+- `/var/www/html/themes/` theming/branding
+
+If you want to use named volumes for all of these, it would look like this:
+```console
+$ docker run -d \
+-v nextcloud:/var/www/html \
+-v apps:/var/www/html/custom_apps \
+-v config:/var/www/html/config \
+-v data:/var/www/html/data \
+-v theme:/var/www/html/themes/ \
+nextcloud
+```
+
+## Using the Nextcloud command-line interface
+To use the [Nextcloud command-line interface](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/occ_command.html) (aka. `occ` command):
+```console
+$ docker exec --user www-data CONTAINER_ID php occ
+```
+or for docker-compose:
+```console
+$ docker-compose exec --user www-data app php occ
+```
+
+## Auto configuration via environment variables
+The nextcloud image supports auto configuration via environment variables. You can preconfigure everything that is asked on the install page on first run. To enable auto configuration, set your database connection via the following environment variables. ONLY use one database type!
+
+__SQLite__:
+- `SQLITE_DATABASE` Name of the database using sqlite
+
+__MYSQL/MariaDB__:
+- `MYSQL_DATABASE` Name of the database using mysql / mariadb.
+- `MYSQL_USER` Username for the database using mysql / mariadb.
+- `MYSQL_PASSWORD` Password for the database user using mysql / mariadb.
+- `MYSQL_HOST` Hostname of the database server using mysql / mariadb.
+
+__PostgreSQL__:
+- `POSTGRES_DB` Name of the database using postgres.
+- `POSTGRES_USER` Username for the database using postgres.
+- `POSTGRES_PASSWORD` Password for the database user using postgres.
+- `POSTGRES_HOST` Hostname of the database server using postgres.
+
+If you set any values, they will not be asked in the install page on first run. With a complete configuration by using all variables for your database type, you can additionally configure your Nextcloud instance by setting admin user and password (only works if you set both):
+
+- `NEXTCLOUD_ADMIN_USER` Name of the Nextcloud admin user.
+- `NEXTCLOUD_ADMIN_PASSWORD` Password for the Nextcloud admin user.
+
+If you want, you can set the data directory, otherwise default value will be used.
+
+- `NEXTCLOUD_DATA_DIR` (default: _/var/www/html/data_) Configures the data directory where nextcloud stores all files from the users.
+
+One or more trusted domains can be set through environment variable, too. They will be added to the configuration after install.
+
+- `NEXTCLOUD_TRUSTED_DOMAINS` (not set by default) Optional space-separated list of domains
+
+The install and update script is only triggered when a default command is used (`apache-foreground` or `php-fpm`). If you use a custom command you have to enable the install / update with
+
+- `NEXTCLOUD_UPDATE` (default: _0_)
+
+If you want to use Redis you have to create a separate [Redis](https://hub.docker.com/_/redis/) container in your setup / in your docker-compose file. To inform Nextcloud about the Redis container, pass in the following parameters:
+
+- `REDIS_HOST` (not set by default) Name of Redis container
+- `REDIS_HOST_PORT` (default: _6379_) Optional port for Redis, only use for external Redis servers that run on non-standard ports.
+- `REDIS_HOST_PASSWORD` (not set by default) Redis password
+
+The use of Redis is recommended to prevent file locking problems. See the examples for further instructions.
+
+To use an external SMTP server, you have to provide the connection details. To configure Nextcloud to use SMTP add:
+
+- `SMTP_HOST` (not set by default): The hostname of the SMTP server.
+- `SMTP_SECURE` (empty by default): Set to `ssl` to use SSL, or `tls` to use STARTTLS.
+- `SMTP_PORT` (default: `465` for SSL and `25` for non-secure connections): Optional port for the SMTP connection. Use `587` for an alternative port for STARTTLS.
+- `SMTP_AUTHTYPE` (default: `LOGIN`): The method used for authentication. Use `PLAIN` if no authentication is required.
+- `SMTP_NAME` (empty by default): The username for the authentication.
+- `SMTP_PASSWORD` (empty by default): The password for the authentication.
+- `MAIL_FROM_ADDRESS` (not set by default): Use this address for the 'from' field in the emails sent by Nextcloud.
+- `MAIL_DOMAIN` (not set by default): Set a different domain for the emails than the domain where Nextcloud is installed.
+
+Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/email_configuration.html) for other values to configure SMTP.
+
+To use an external S3 compatible object store as primary storage, set the following variables:
+- `OBJECTSTORE_S3_HOST`: The hostname of the object storage server
+- `OBJECTSTORE_S3_BUCKET`: The name of the bucket that Nextcloud should store the data in
+- `OBJECTSTORE_S3_KEY`: AWS style access key
+- `OBJECTSTORE_S3_SECRET`: AWS style secret access key
+- `OBJECTSTORE_S3_PORT`: The port that the object storage server is being served over
+- `OBJECTSTORE_S3_SSL` (default: `true`): Whether or not SSL/TLS should be used to communicate with object storage server
+- `OBJECTSTORE_S3_REGION`: The region that the S3 bucket resides in.
+- `OBJECTSTORE_S3_USEPATH_STYLE` (default: `false`): Not required for AWS S3
+
+Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/primary_storage.html#simple-storage-service-s3) for more information.
+
+To use an external OpenStack Swift object store as primary storage, set the following variables:
+- `OBJECTSTORE_SWIFT_URL`: The Swift identity (Keystone) endpoint
+- `OBJECTSTORE_SWIFT_AUTOCREATE` (default: `false`): Whether or not Nextcloud should automatically create the Swift container
+- `OBJECTSTORE_SWIFT_USER_NAME`: Swift username
+- `OBJECTSTORE_SWIFT_USER_PASSWORD`: Swift user password
+- `OBJECTSTORE_SWIFT_USER_DOMAIN` (default: `Default`): Swift user domain
+- `OBJECTSTORE_SWIFT_PROJECT_NAME`: OpenStack project name
+- `OBJECTSTORE_SWIFT_PROJECT_DOMAIN` (default: `Default`): OpenStack project domain
+- `OBJECTSTORE_SWIFT_SERVICE_NAME` (default: `swift`): Swift service name
+- `OBJECTSTORE_SWIFT_SERVICE_REGION`: Swift endpoint region
+- `OBJECTSTORE_SWIFT_CONTAINER_NAME`: Swift container (bucket) that Nextcloud should store the data in
+
+Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/primary_storage.html#openstack-swift) for more information.
+
+
+## Using the apache image behind a reverse proxy and auto configure server host and protocol
+
+The apache image will replace the remote addr (ip address visible to Nextcloud) with the ip address from `X-Real-IP` if the request is coming from a proxy in 10.0.0.0/8, 172.16.0.0/12 or 192.168.0.0/16 by default. If you want Nextcloud to pick up the server host (`HTTP_X_FORWARDED_HOST`), protocol (`HTTP_X_FORWARDED_PROTO`) and client ip (`HTTP_X_FORWARDED_FOR`) from a trusted proxy disable rewrite ip and the reverse proxies ip address to `TRUSTED_PROXIES`.
+
+- `APACHE_DISABLE_REWRITE_IP` (not set by default): Set to 1 to disable rewrite ip.
+
+- `TRUSTED_PROXIES` (empty by default): A space-separated list of trusted proxies. CIDR notation is supported for IPv4.
+
+If the `TRUSTED_PROXIES` approach does not work for you, try using fixed values for overwrite parameters.
+
+- `OVERWRITEHOST` (empty by default): Set the hostname of the proxy. Can also specify a port.
+- `OVERWRITEPROTOCOL` (empty by default): Set the protocol of the proxy, http or https.
+- `OVERWRITEWEBROOT` (empty by default): Set the absolute path of the proxy.
+- `OVERWRITECONDADDR` (empty by default): Regex to overwrite the values dependent on the remote address.
+
+Check the [Nexcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/reverse_proxy_configuration.html) for more details.
+
+Keep in mind that once set, removing these environment variables won't remove these values from the configuration file, due to how Nextcloud merges configuration files together.
+
+# Running this image with docker-compose
+The easiest way to get a fully featured and functional setup is using a `docker-compose` file. There are too many different possibilities to setup your system, so here are only some examples of what you have to look for.
+
+At first, make sure you have chosen the right base image (fpm or apache) and added features you wanted (see below). In every case, you would want to add a database container and docker volumes to get easy access to your persistent data. When you want to have your server reachable from the internet, adding HTTPS-encryption is mandatory! See below for more information.
+
+## Base version - apache
+This version will use the apache image and add a mariaDB container. The volumes are set to keep your data persistent. This setup provides **no ssl encryption** and is intended to run behind a proxy.
+
+Make sure to pass in values for `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` variables before you run this setup.
+
+```yaml
+version: '2'
+
+volumes:
+ nextcloud:
+ db:
+
+services:
+ db:
+ image: mariadb
+ command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+ restart: always
+ volumes:
+ - db:/var/lib/mysql
+ environment:
+ - MYSQL_ROOT_PASSWORD=
+ - MYSQL_PASSWORD=
+ - MYSQL_DATABASE=nextcloud
+ - MYSQL_USER=nextcloud
+
+ app:
+ image: nextcloud
+ ports:
+ - 8080:80
+ links:
+ - db
+ volumes:
+ - nextcloud:/var/www/html
+ restart: always
+
+```
+
+Then run `docker-compose up -d`, now you can access Nextcloud at http://localhost:8080/ from your host system.
+
+## Base version - FPM
+When using the FPM image, you need another container that acts as web server on port 80 and proxies the requests to the Nextcloud container. In this example a simple nginx container is combined with the Nextcloud-fpm image and a MariaDB database container. The data is stored in docker volumes. The nginx container also needs access to static files from your Nextcloud installation. It gets access to all the volumes mounted to Nextcloud via the `volumes_from` option.The configuration for nginx is stored in the configuration file `nginx.conf`, that is mounted into the container. An example can be found in the examples section [here](https://github.com/nextcloud/docker/tree/master/.examples).
+
+As this setup does **not include encryption**, it should be run behind a proxy.
+
+Make sure to pass in values for `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` variables before you run this setup.
+
+```yaml
+version: '2'
+
+volumes:
+ nextcloud:
+ db:
+
+services:
+ db:
+ image: mariadb
+ command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+ restart: always
+ volumes:
+ - db:/var/lib/mysql
+ environment:
+ - MYSQL_ROOT_PASSWORD=
+ - MYSQL_PASSWORD=
+ - MYSQL_DATABASE=nextcloud
+ - MYSQL_USER=nextcloud
+
+ app:
+ image: nextcloud:fpm
+ links:
+ - db
+ volumes:
+ - nextcloud:/var/www/html
+ restart: always
+
+ web:
+ image: nginx
+ ports:
+ - 8080:80
+ links:
+ - app
+ volumes:
+ - ./nginx.conf:/etc/nginx/nginx.conf:ro
+ volumes_from:
+ - app
+ restart: always
+```
+
+Then run `docker-compose up -d`, now you can access Nextcloud at http://localhost:8080/ from your host system.
+
+# Docker Secrets
+As an alternative to passing sensitive information via environment variables, _FILE may be appended to the previously listed environment variables, causing the initialization script to load the values for those variables from files present in the container. In particular, this can be used to load passwords from Docker secrets stored in /run/secrets/ files. For example:
+```yaml
+version: '3.2'
+
+services:
+ db:
+ image: postgres
+ restart: always
+ volumes:
+ - db:/var/lib/postgresql/data
+ environment:
+ - POSTGRES_DB_FILE=/run/secrets/postgres_db
+ - POSTGRES_USER_FILE=/run/secrets/postgres_user
+ - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
+ secrets:
+ - postgres_db
+ - postgres_password
+ - postgres_user
+
+ app:
+ image: nextcloud
+ restart: always
+ ports:
+ - 8080:80
+ volumes:
+ - nextcloud:/var/www/html
+ environment:
+ - POSTGRES_HOST=db
+ - POSTGRES_DB_FILE=/run/secrets/postgres_db
+ - POSTGRES_USER_FILE=/run/secrets/postgres_user
+ - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
+ - NEXTCLOUD_ADMIN_PASSWORD_FILE=/run/secrets/nextcloud_admin_password
+ - NEXTCLOUD_ADMIN_USER_FILE=/run/secrets/nextcloud_admin_user
+ depends_on:
+ - db
+ secrets:
+ - nextcloud_admin_password
+ - nextcloud_admin_user
+ - postgres_db
+ - postgres_password
+ - postgres_user
+
+volumes:
+ db:
+ nextcloud:
+
+secrets:
+ nextcloud_admin_password:
+ file: ./nextcloud_admin_password.txt # put admin password to this file
+ nextcloud_admin_user:
+ file: ./nextcloud_admin_user.txt # put admin username to this file
+ postgres_db:
+ file: ./postgres_db.txt # put postgresql db name to this file
+ postgres_password:
+ file: ./postgres_password.txt # put postgresql password to this file
+ postgres_user:
+ file: ./postgres_user.txt # put postgresql username to this file
+```
+
+Currently, this is only supported for `NEXTCLOUD_ADMIN_PASSWORD`, `NEXTCLOUD_ADMIN_USER`, `MYSQL_DB`, `MYSQL_PASSWORD`, `MYSQL_USER`, `POSTGRES_DB`, `POSTGRES_PASSWORD`, `POSTGRES_USER`.
+
+# Make your Nextcloud available from the internet
+Until here, your Nextcloud is just available from you docker host. If you want your Nextcloud available from the internet adding SSL encryption is mandatory.
+
+## HTTPS - SSL encryption
+There are many different possibilities to introduce encryption depending on your setup.
+
+We recommend using a reverse proxy in front of our Nextcloud installation. Your Nextcloud will only be reachable through the proxy, which encrypts all traffic to the clients. You can mount your manually generated certificates to the proxy or use a fully automated solution which generates and renews the certificates for you.
+
+In our [examples](https://github.com/nextcloud/docker/tree/master/.examples) section we have an example for a fully automated setup using a reverse proxy, a container for [Let's Encrypt](https://letsencrypt.org/) certificate handling, database and Nextcloud. It uses the popular [nginx-proxy](https://github.com/jwilder/nginx-proxy) and [docker-letsencrypt-nginx-proxy-companion](https://github.com/JrCs/docker-letsencrypt-nginx-proxy-companion) containers. Please check the according documentations before using this setup.
+
+# First use
+When you first access your Nextcloud, the setup wizard will appear and ask you to choose an administrator account username, password and the database connection. For the database use `db` as host and `nextcloud` as table and user name. Also enter the password you chose in your `docker-compose.yml` file.
+
+# Update to a newer version
+Updating the Nextcloud container is done by pulling the new image, throwing away the old container and starting the new one.
+
+**It is only possible to upgrade one major version at a time. For example, if you want to upgrade from version 14 to 16, you will have to upgrade from version 14 to 15, then from 15 to 16.**
+
+Since all data is stored in volumes, nothing gets lost. The startup script will check for the version in your volume and the installed docker version. If it finds a mismatch, it automatically starts the upgrade process. Don't forget to add all the volumes to your new container, so it works as expected.
+
+```console
+$ docker pull nextcloud
+$ docker stop
+$ docker rm
+$ docker run -d nextcloud
+```
+Beware that you have to run the same command with the options that you used to initially start your Nextcloud. That includes volumes, port mapping.
+
+When using docker-compose your compose file takes care of your configuration, so you just have to run:
+
+```console
+$ docker-compose pull
+$ docker-compose up -d
+```
+
+
+# Adding Features
+A lot of people want to use additional functionality inside their Nextcloud installation. If the image does not include the packages you need, you can easily build your own image on top of it.
+Start your derived image with the `FROM` statement and add whatever you like.
+
+```yaml
+FROM nextcloud:apache
+
+RUN ...
+
+```
+The [examples folder](https://github.com/nextcloud/docker/blob/master/.examples) gives a few examples on how to add certain functionalities, like including the cron job, smb-support or imap-authentication.
+
+If you use your own Dockerfile, you need to configure your docker-compose file accordingly. Switch out the `image` option with `build`. You have to specify the path to your Dockerfile. (in the example it's in the same directory next to the docker-compose file)
+
+```yaml
+ app:
+ build: .
+ links:
+ - db
+ volumes:
+ - data:/var/www/html/data
+ - config:/var/www/html/config
+ - apps:/var/www/html/apps
+ restart: always
+```
+
+If you intend to use another command to run the image, make sure that you set `NEXTCLOUD_UPDATE=1` in your Dockerfile. Otherwise the installation and update will not work.
+
+```yaml
+FROM nextcloud:apache
+
+...
+
+ENV NEXTCLOUD_UPDATE=1
+
+CMD ["/usr/bin/supervisord"]
+```
+
+
+**Updating** your own derived image is also very simple. When a new version of the Nextcloud image is available run:
+
+```console
+docker build -t your-name --pull .
+docker run -d your-name
+```
+
+or for docker-compose:
+```console
+docker-compose build --pull
+docker-compose up -d
+```
+
+The `--pull` option tells docker to look for new versions of the base image. Then the build instructions inside your `Dockerfile` are run on top of the new image.
+
+# Migrating an existing installation
+You're already using Nextcloud and want to switch to docker? Great! Here are some things to look out for:
+
+1. Define your whole Nextcloud infrastructure in a `docker-compose` file and run it with `docker-compose up -d` to get the base installation, volumes and database. Work from there.
+2. Restore your database from a mysqldump (nextcloud\_db\_1 is the name of your db container)
+ - To import from a MySQL dump use the following commands
+ ```console
+ docker cp ./database.dmp nextcloud_db_1:/dmp
+ docker-compose exec db sh -c "mysql -u USER -pPASSWORD nextcloud < /dmp"
+ docker-compose exec db rm /dmp
+ ```
+ - To import from a PostgreSQL dump use to following commands
+ ```console
+ docker cp ./database.dmp nextcloud_db_1:/dmp
+ docker-compose exec db sh -c "psql -U USER --set ON_ERROR_STOP=on nextcloud < /dmp"
+ docker-compose exec db rm /dmp
+ ```
+3. Edit your config.php
+ 1. Set database connection
+ - In case of MySQL database
+ ```php
+ 'dbhost' => 'db:3306',
+ ```
+ - In case of PostgreSQL database
+ ```php
+ 'dbhost' => 'db:5432',
+ ```
+ 2. Make sure you have no configuration for the `apps_paths`. Delete lines like these
+ ```diff
+ - "apps_paths" => array (
+ - 0 => array (
+ - "path" => OC::$SERVERROOT."/apps",
+ - "url" => "/apps",
+ - "writable" => true,
+ - ),
+ ```
+ 3. Make sure to have the `apps` directory non writable and the `custom_apps` directory writable
+ ```php
+ 'apps_paths' => array (
+ 0 => array (
+ 'path' => '/var/www/html/apps',
+ 'url' => '/apps',
+ 'writable' => false,
+ ),
+ 1 => array (
+ 'path' => '/var/www/html/custom_apps',
+ 'url' => '/custom_apps',
+ 'writable' => true,
+ ),
+ ),
+ ```
+ 4. Make sure your data directory is set to /var/www/html/data
+ ```php
+ 'datadirectory' => '/var/www/html/data',
+ ```
+
+
+4. Copy your data (nextcloud_app_1 is the name of your Nextcloud container):
+```console
+docker cp ./data/ nextcloud_app_1:/var/www/html/
+docker-compose exec app chown -R www-data:www-data /var/www/html/data
+docker cp ./theming/ nextcloud_app_1:/var/www/html/
+docker-compose exec app chown -R www-data:www-data /var/www/html/theming
+docker cp ./config/config.php nextcloud_app_1:/var/www/html/config
+docker-compose exec app chown -R www-data:www-data /var/www/html/config
+```
+5. Copy only the custom apps you use (or simply redownload them from the web interface):
+```console
+docker cp ./custom_apps/ nextcloud_data:/var/www/html/
+docker-compose exec app chown -R www-data:www-data /var/www/html/custom_apps
+```
+
+# Questions / Issues
+If you got any questions or problems using the image, please visit our [Github Repository](https://github.com/nextcloud/docker) and write an issue.
diff --git a/linux/advanced/nextcloud/pure/21/docker-compose.yml b/linux/advanced/nextcloud/pure/21/docker-compose.yml
new file mode 100644
index 000000000..f6bd84428
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/21/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+ app:
+ image: "epicmorg/nextcloud:21"
+ build:
+ context: .
diff --git a/linux/nextcloud/21/smb.conf b/linux/advanced/nextcloud/pure/21/smb.conf
similarity index 100%
rename from linux/nextcloud/21/smb.conf
rename to linux/advanced/nextcloud/pure/21/smb.conf
diff --git a/linux/advanced/nextcloud/pure/21/sources.list b/linux/advanced/nextcloud/pure/21/sources.list
new file mode 100644
index 000000000..5a8c0081a
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/21/sources.list
@@ -0,0 +1,21 @@
+#main
+deb http://httpredir.debian.org/debian/ bullseye main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye main contrib non-free
+deb http://httpredir.debian.org/debian/ bullseye-updates main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye-updates main contrib non-free
+deb http://httpredir.debian.org/debian/ bullseye-backports main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye-backports main contrib non-free
+deb http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib non-free
+
+#security
+deb http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free
+deb-src http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free
+deb http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free
+deb-src http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free
+
+##multimedia
+# deb http://httpredir.debian.org/debian-multimedia/ bullseye main non-free
+# deb-src http://httpredir.debian.org/debian-multimedia/ bullseye main non-free
+# deb http://httpredir.debian.org/debian-multimedia/ bullseye-backports main
+# deb-src http://httpredir.debian.org/debian-multimedia/ bullseye-backports main
diff --git a/linux/advanced/nextcloud/pure/22/Dockerfile b/linux/advanced/nextcloud/pure/22/Dockerfile
new file mode 100644
index 000000000..8c659bbe9
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/22/Dockerfile
@@ -0,0 +1,68 @@
+FROM nextcloud:22
+ENV DEBIAN_FRONTEND noninteractive
+
+##################################################################
+# adding normal sources list
+##################################################################
+RUN rm /etc/apt/sources.list
+COPY sources.list /etc/apt/sources.list
+
+##################################################################
+# adding some utils
+##################################################################
+RUN apt update -y && \
+ apt dist-upgrade -y && \
+ apt install -y --allow-unauthenticated \
+ apt-transport-https \
+ curl \
+ ca-certificates \
+ ghostscript \
+ nload \
+ htop \
+ mc \
+ nano \
+ sudo \
+ imagemagick \
+ imagemagick-common \
+ sqlite3 \
+ smbclient \
+ libsmbclient \
+ wget \
+ net-tools \
+ iputils-ping
+
+
+##################################################################
+# installing php repo + smbclient
+##################################################################
+RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
+RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list'
+RUN apt update -y && \
+ apt install -y --allow-unauthenticated \
+ libsmbclient-dev \
+ libmagickwand-dev \
+ libmagickcore-dev \
+ libc-client-dev \
+ libkrb5-dev \
+ libsqlite3-dev \
+ libssl-dev
+
+RUN pecl install inotify && \
+ docker-php-ext-enable inotify
+
+RUN pecl install smbclient && \
+ docker-php-ext-enable smbclient
+
+RUN docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
+ docker-php-ext-install imap && \
+ docker-php-ext-enable imap
+
+RUN docker-php-ext-install fileinfo bz2 intl ftp pdo_sqlite && \
+ docker-php-ext-enable fileinfo bz2 intl ftp pdo_sqlite
+
+##################################################################
+# smb fix
+##################################################################
+RUN rm -frv /etc/samba/smb.conf /usr/share/samba/smb.conf
+ADD smb.conf /etc/samba/
+ADD smb.conf /usr/share/samba/
diff --git a/linux/advanced/nextcloud/pure/22/Makefile b/linux/advanced/nextcloud/pure/22/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/22/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+ make build
+ make deploy
+ make clean
+
+build:
+ docker-compose build --compress --parallel
+
+deploy:
+ docker-compose push
+
+clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
diff --git a/linux/advanced/nextcloud/pure/22/README.md b/linux/advanced/nextcloud/pure/22/README.md
new file mode 100644
index 000000000..b6df71808
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/22/README.md
@@ -0,0 +1,527 @@
+# What is Nextcloud?
+
+[](https://github.com/nextcloud/docker/actions?query=workflow%3AImages)
+[](https://github.com/nextcloud/docker/actions?query=workflow%3Aupdate.sh)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/i386/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/mips64le/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/s390x/job/nextcloud)
+
+A safe home for all your data. Access & share your files, calendars, contacts, mail & more from any device, on your terms.
+
+
+
+# How to use this image
+This image is designed to be used in a micro-service environment. There are two versions of the image you can choose from.
+
+The `apache` tag contains a full Nextcloud installation including an apache web server. It is designed to be easy to use and gets you running pretty fast. This is also the default for the `latest` tag and version tags that are not further specified.
+
+The second option is a `fpm` container. It is based on the [php-fpm](https://hub.docker.com/_/php/) image and runs a fastCGI-Process that serves your Nextcloud page. To use this image it must be combined with any webserver that can proxy the http requests to the FastCGI-port of the container.
+
+[](http://play-with-docker.com?stack=https://raw.githubusercontent.com/nextcloud/docker/8db861d67f257a3e9ac1790ea06d4e2a7a193a6c/stack.yml)
+
+## Using the apache image
+The apache image contains a webserver and exposes port 80. To start the container type:
+
+```console
+$ docker run -d -p 8080:80 nextcloud
+```
+
+Now you can access Nextcloud at http://localhost:8080/ from your host system.
+
+
+## Using the fpm image
+To use the fpm image, you need an additional web server that can proxy http-request to the fpm-port of the container. For fpm connection this container exposes port 9000. In most cases, you might want use another container or your host as proxy.
+If you use your host you can address your Nextcloud container directly on port 9000. If you use another container, make sure that you add them to the same docker network (via `docker run --network ...` or a `docker-compose` file).
+In both cases you don't want to map the fpm port to your host.
+
+```console
+$ docker run -d nextcloud:fpm
+```
+
+As the fastCGI-Process is not capable of serving static files (style sheets, images, ...), the webserver needs access to these files. This can be achieved with the `volumes-from` option. You can find more information in the [docker-compose section](#running-this-image-with-docker-compose).
+
+## Using an external database
+By default, this container uses SQLite for data storage but the Nextcloud setup wizard (appears on first run) allows connecting to an existing MySQL/MariaDB or PostgreSQL database. You can also link a database container, e. g. `--link my-mysql:mysql`, and then use `mysql` as the database host on setup. More info is in the docker-compose section.
+
+## Persistent data
+The Nextcloud installation and all data beyond what lives in the database (file uploads, etc) are stored in the [unnamed docker volume](https://docs.docker.com/engine/tutorials/dockervolumes/#adding-a-data-volume) volume `/var/www/html`. The docker daemon will store that data within the docker directory `/var/lib/docker/volumes/...`. That means your data is saved even if the container crashes, is stopped or deleted.
+
+A named Docker volume or a mounted host directory should be used for upgrades and backups. To achieve this, you need one volume for your database container and one for Nextcloud.
+
+Nextcloud:
+- `/var/www/html/` folder where all nextcloud data lives
+```console
+$ docker run -d \
+-v nextcloud:/var/www/html \
+nextcloud
+```
+
+Database:
+- `/var/lib/mysql` MySQL / MariaDB Data
+- `/var/lib/postgresql/data` PostgreSQL Data
+```console
+$ docker run -d \
+-v db:/var/lib/mysql \
+mariadb
+```
+
+If you want to get fine grained access to your individual files, you can mount additional volumes for data, config, your theme and custom apps.
+The `data`, `config` files are stored in respective subfolders inside `/var/www/html/`. The apps are split into core `apps` (which are shipped with Nextcloud and you don't need to take care of) and a `custom_apps` folder. If you use a custom theme it would go into the `themes` subfolder.
+
+Overview of the folders that can be mounted as volumes:
+
+- `/var/www/html` Main folder, needed for updating
+- `/var/www/html/custom_apps` installed / modified apps
+- `/var/www/html/config` local configuration
+- `/var/www/html/data` the actual data of your Nextcloud
+- `/var/www/html/themes/` theming/branding
+
+If you want to use named volumes for all of these, it would look like this:
+```console
+$ docker run -d \
+-v nextcloud:/var/www/html \
+-v apps:/var/www/html/custom_apps \
+-v config:/var/www/html/config \
+-v data:/var/www/html/data \
+-v theme:/var/www/html/themes/ \
+nextcloud
+```
+
+## Using the Nextcloud command-line interface
+To use the [Nextcloud command-line interface](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/occ_command.html) (aka. `occ` command):
+```console
+$ docker exec --user www-data CONTAINER_ID php occ
+```
+or for docker-compose:
+```console
+$ docker-compose exec --user www-data app php occ
+```
+
+## Auto configuration via environment variables
+The nextcloud image supports auto configuration via environment variables. You can preconfigure everything that is asked on the install page on first run. To enable auto configuration, set your database connection via the following environment variables. ONLY use one database type!
+
+__SQLite__:
+- `SQLITE_DATABASE` Name of the database using sqlite
+
+__MYSQL/MariaDB__:
+- `MYSQL_DATABASE` Name of the database using mysql / mariadb.
+- `MYSQL_USER` Username for the database using mysql / mariadb.
+- `MYSQL_PASSWORD` Password for the database user using mysql / mariadb.
+- `MYSQL_HOST` Hostname of the database server using mysql / mariadb.
+
+__PostgreSQL__:
+- `POSTGRES_DB` Name of the database using postgres.
+- `POSTGRES_USER` Username for the database using postgres.
+- `POSTGRES_PASSWORD` Password for the database user using postgres.
+- `POSTGRES_HOST` Hostname of the database server using postgres.
+
+If you set any values, they will not be asked in the install page on first run. With a complete configuration by using all variables for your database type, you can additionally configure your Nextcloud instance by setting admin user and password (only works if you set both):
+
+- `NEXTCLOUD_ADMIN_USER` Name of the Nextcloud admin user.
+- `NEXTCLOUD_ADMIN_PASSWORD` Password for the Nextcloud admin user.
+
+If you want, you can set the data directory, otherwise default value will be used.
+
+- `NEXTCLOUD_DATA_DIR` (default: _/var/www/html/data_) Configures the data directory where nextcloud stores all files from the users.
+
+One or more trusted domains can be set through environment variable, too. They will be added to the configuration after install.
+
+- `NEXTCLOUD_TRUSTED_DOMAINS` (not set by default) Optional space-separated list of domains
+
+The install and update script is only triggered when a default command is used (`apache-foreground` or `php-fpm`). If you use a custom command you have to enable the install / update with
+
+- `NEXTCLOUD_UPDATE` (default: _0_)
+
+If you want to use Redis you have to create a separate [Redis](https://hub.docker.com/_/redis/) container in your setup / in your docker-compose file. To inform Nextcloud about the Redis container, pass in the following parameters:
+
+- `REDIS_HOST` (not set by default) Name of Redis container
+- `REDIS_HOST_PORT` (default: _6379_) Optional port for Redis, only use for external Redis servers that run on non-standard ports.
+- `REDIS_HOST_PASSWORD` (not set by default) Redis password
+
+The use of Redis is recommended to prevent file locking problems. See the examples for further instructions.
+
+To use an external SMTP server, you have to provide the connection details. To configure Nextcloud to use SMTP add:
+
+- `SMTP_HOST` (not set by default): The hostname of the SMTP server.
+- `SMTP_SECURE` (empty by default): Set to `ssl` to use SSL, or `tls` to use STARTTLS.
+- `SMTP_PORT` (default: `465` for SSL and `25` for non-secure connections): Optional port for the SMTP connection. Use `587` for an alternative port for STARTTLS.
+- `SMTP_AUTHTYPE` (default: `LOGIN`): The method used for authentication. Use `PLAIN` if no authentication is required.
+- `SMTP_NAME` (empty by default): The username for the authentication.
+- `SMTP_PASSWORD` (empty by default): The password for the authentication.
+- `MAIL_FROM_ADDRESS` (not set by default): Use this address for the 'from' field in the emails sent by Nextcloud.
+- `MAIL_DOMAIN` (not set by default): Set a different domain for the emails than the domain where Nextcloud is installed.
+
+Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/email_configuration.html) for other values to configure SMTP.
+
+To use an external S3 compatible object store as primary storage, set the following variables:
+- `OBJECTSTORE_S3_HOST`: The hostname of the object storage server
+- `OBJECTSTORE_S3_BUCKET`: The name of the bucket that Nextcloud should store the data in
+- `OBJECTSTORE_S3_KEY`: AWS style access key
+- `OBJECTSTORE_S3_SECRET`: AWS style secret access key
+- `OBJECTSTORE_S3_PORT`: The port that the object storage server is being served over
+- `OBJECTSTORE_S3_SSL` (default: `true`): Whether or not SSL/TLS should be used to communicate with object storage server
+- `OBJECTSTORE_S3_REGION`: The region that the S3 bucket resides in.
+- `OBJECTSTORE_S3_USEPATH_STYLE` (default: `false`): Not required for AWS S3
+
+Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/primary_storage.html#simple-storage-service-s3) for more information.
+
+To use an external OpenStack Swift object store as primary storage, set the following variables:
+- `OBJECTSTORE_SWIFT_URL`: The Swift identity (Keystone) endpoint
+- `OBJECTSTORE_SWIFT_AUTOCREATE` (default: `false`): Whether or not Nextcloud should automatically create the Swift container
+- `OBJECTSTORE_SWIFT_USER_NAME`: Swift username
+- `OBJECTSTORE_SWIFT_USER_PASSWORD`: Swift user password
+- `OBJECTSTORE_SWIFT_USER_DOMAIN` (default: `Default`): Swift user domain
+- `OBJECTSTORE_SWIFT_PROJECT_NAME`: OpenStack project name
+- `OBJECTSTORE_SWIFT_PROJECT_DOMAIN` (default: `Default`): OpenStack project domain
+- `OBJECTSTORE_SWIFT_SERVICE_NAME` (default: `swift`): Swift service name
+- `OBJECTSTORE_SWIFT_SERVICE_REGION`: Swift endpoint region
+- `OBJECTSTORE_SWIFT_CONTAINER_NAME`: Swift container (bucket) that Nextcloud should store the data in
+
+Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/primary_storage.html#openstack-swift) for more information.
+
+
+## Using the apache image behind a reverse proxy and auto configure server host and protocol
+
+The apache image will replace the remote addr (ip address visible to Nextcloud) with the ip address from `X-Real-IP` if the request is coming from a proxy in 10.0.0.0/8, 172.16.0.0/12 or 192.168.0.0/16 by default. If you want Nextcloud to pick up the server host (`HTTP_X_FORWARDED_HOST`), protocol (`HTTP_X_FORWARDED_PROTO`) and client ip (`HTTP_X_FORWARDED_FOR`) from a trusted proxy disable rewrite ip and the reverse proxies ip address to `TRUSTED_PROXIES`.
+
+- `APACHE_DISABLE_REWRITE_IP` (not set by default): Set to 1 to disable rewrite ip.
+
+- `TRUSTED_PROXIES` (empty by default): A space-separated list of trusted proxies. CIDR notation is supported for IPv4.
+
+If the `TRUSTED_PROXIES` approach does not work for you, try using fixed values for overwrite parameters.
+
+- `OVERWRITEHOST` (empty by default): Set the hostname of the proxy. Can also specify a port.
+- `OVERWRITEPROTOCOL` (empty by default): Set the protocol of the proxy, http or https.
+- `OVERWRITEWEBROOT` (empty by default): Set the absolute path of the proxy.
+- `OVERWRITECONDADDR` (empty by default): Regex to overwrite the values dependent on the remote address.
+
+Check the [Nexcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/reverse_proxy_configuration.html) for more details.
+
+Keep in mind that once set, removing these environment variables won't remove these values from the configuration file, due to how Nextcloud merges configuration files together.
+
+# Running this image with docker-compose
+The easiest way to get a fully featured and functional setup is using a `docker-compose` file. There are too many different possibilities to setup your system, so here are only some examples of what you have to look for.
+
+At first, make sure you have chosen the right base image (fpm or apache) and added features you wanted (see below). In every case, you would want to add a database container and docker volumes to get easy access to your persistent data. When you want to have your server reachable from the internet, adding HTTPS-encryption is mandatory! See below for more information.
+
+## Base version - apache
+This version will use the apache image and add a mariaDB container. The volumes are set to keep your data persistent. This setup provides **no ssl encryption** and is intended to run behind a proxy.
+
+Make sure to pass in values for `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` variables before you run this setup.
+
+```yaml
+version: '2'
+
+volumes:
+ nextcloud:
+ db:
+
+services:
+ db:
+ image: mariadb
+ command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+ restart: always
+ volumes:
+ - db:/var/lib/mysql
+ environment:
+ - MYSQL_ROOT_PASSWORD=
+ - MYSQL_PASSWORD=
+ - MYSQL_DATABASE=nextcloud
+ - MYSQL_USER=nextcloud
+
+ app:
+ image: nextcloud
+ ports:
+ - 8080:80
+ links:
+ - db
+ volumes:
+ - nextcloud:/var/www/html
+ restart: always
+
+```
+
+Then run `docker-compose up -d`, now you can access Nextcloud at http://localhost:8080/ from your host system.
+
+## Base version - FPM
+When using the FPM image, you need another container that acts as web server on port 80 and proxies the requests to the Nextcloud container. In this example a simple nginx container is combined with the Nextcloud-fpm image and a MariaDB database container. The data is stored in docker volumes. The nginx container also needs access to static files from your Nextcloud installation. It gets access to all the volumes mounted to Nextcloud via the `volumes_from` option.The configuration for nginx is stored in the configuration file `nginx.conf`, that is mounted into the container. An example can be found in the examples section [here](https://github.com/nextcloud/docker/tree/master/.examples).
+
+As this setup does **not include encryption**, it should be run behind a proxy.
+
+Make sure to pass in values for `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` variables before you run this setup.
+
+```yaml
+version: '2'
+
+volumes:
+ nextcloud:
+ db:
+
+services:
+ db:
+ image: mariadb
+ command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+ restart: always
+ volumes:
+ - db:/var/lib/mysql
+ environment:
+ - MYSQL_ROOT_PASSWORD=
+ - MYSQL_PASSWORD=
+ - MYSQL_DATABASE=nextcloud
+ - MYSQL_USER=nextcloud
+
+ app:
+ image: nextcloud:fpm
+ links:
+ - db
+ volumes:
+ - nextcloud:/var/www/html
+ restart: always
+
+ web:
+ image: nginx
+ ports:
+ - 8080:80
+ links:
+ - app
+ volumes:
+ - ./nginx.conf:/etc/nginx/nginx.conf:ro
+ volumes_from:
+ - app
+ restart: always
+```
+
+Then run `docker-compose up -d`, now you can access Nextcloud at http://localhost:8080/ from your host system.
+
+# Docker Secrets
+As an alternative to passing sensitive information via environment variables, _FILE may be appended to the previously listed environment variables, causing the initialization script to load the values for those variables from files present in the container. In particular, this can be used to load passwords from Docker secrets stored in /run/secrets/ files. For example:
+```yaml
+version: '3.2'
+
+services:
+ db:
+ image: postgres
+ restart: always
+ volumes:
+ - db:/var/lib/postgresql/data
+ environment:
+ - POSTGRES_DB_FILE=/run/secrets/postgres_db
+ - POSTGRES_USER_FILE=/run/secrets/postgres_user
+ - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
+ secrets:
+ - postgres_db
+ - postgres_password
+ - postgres_user
+
+ app:
+ image: nextcloud
+ restart: always
+ ports:
+ - 8080:80
+ volumes:
+ - nextcloud:/var/www/html
+ environment:
+ - POSTGRES_HOST=db
+ - POSTGRES_DB_FILE=/run/secrets/postgres_db
+ - POSTGRES_USER_FILE=/run/secrets/postgres_user
+ - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
+ - NEXTCLOUD_ADMIN_PASSWORD_FILE=/run/secrets/nextcloud_admin_password
+ - NEXTCLOUD_ADMIN_USER_FILE=/run/secrets/nextcloud_admin_user
+ depends_on:
+ - db
+ secrets:
+ - nextcloud_admin_password
+ - nextcloud_admin_user
+ - postgres_db
+ - postgres_password
+ - postgres_user
+
+volumes:
+ db:
+ nextcloud:
+
+secrets:
+ nextcloud_admin_password:
+ file: ./nextcloud_admin_password.txt # put admin password to this file
+ nextcloud_admin_user:
+ file: ./nextcloud_admin_user.txt # put admin username to this file
+ postgres_db:
+ file: ./postgres_db.txt # put postgresql db name to this file
+ postgres_password:
+ file: ./postgres_password.txt # put postgresql password to this file
+ postgres_user:
+ file: ./postgres_user.txt # put postgresql username to this file
+```
+
+Currently, this is only supported for `NEXTCLOUD_ADMIN_PASSWORD`, `NEXTCLOUD_ADMIN_USER`, `MYSQL_DB`, `MYSQL_PASSWORD`, `MYSQL_USER`, `POSTGRES_DB`, `POSTGRES_PASSWORD`, `POSTGRES_USER`.
+
+# Make your Nextcloud available from the internet
+Until here, your Nextcloud is just available from you docker host. If you want your Nextcloud available from the internet adding SSL encryption is mandatory.
+
+## HTTPS - SSL encryption
+There are many different possibilities to introduce encryption depending on your setup.
+
+We recommend using a reverse proxy in front of our Nextcloud installation. Your Nextcloud will only be reachable through the proxy, which encrypts all traffic to the clients. You can mount your manually generated certificates to the proxy or use a fully automated solution which generates and renews the certificates for you.
+
+In our [examples](https://github.com/nextcloud/docker/tree/master/.examples) section we have an example for a fully automated setup using a reverse proxy, a container for [Let's Encrypt](https://letsencrypt.org/) certificate handling, database and Nextcloud. It uses the popular [nginx-proxy](https://github.com/jwilder/nginx-proxy) and [docker-letsencrypt-nginx-proxy-companion](https://github.com/JrCs/docker-letsencrypt-nginx-proxy-companion) containers. Please check the according documentations before using this setup.
+
+# First use
+When you first access your Nextcloud, the setup wizard will appear and ask you to choose an administrator account username, password and the database connection. For the database use `db` as host and `nextcloud` as table and user name. Also enter the password you chose in your `docker-compose.yml` file.
+
+# Update to a newer version
+Updating the Nextcloud container is done by pulling the new image, throwing away the old container and starting the new one.
+
+**It is only possible to upgrade one major version at a time. For example, if you want to upgrade from version 14 to 16, you will have to upgrade from version 14 to 15, then from 15 to 16.**
+
+Since all data is stored in volumes, nothing gets lost. The startup script will check for the version in your volume and the installed docker version. If it finds a mismatch, it automatically starts the upgrade process. Don't forget to add all the volumes to your new container, so it works as expected.
+
+```console
+$ docker pull nextcloud
+$ docker stop
+$ docker rm
+$ docker run -d nextcloud
+```
+Beware that you have to run the same command with the options that you used to initially start your Nextcloud. That includes volumes, port mapping.
+
+When using docker-compose your compose file takes care of your configuration, so you just have to run:
+
+```console
+$ docker-compose pull
+$ docker-compose up -d
+```
+
+
+# Adding Features
+A lot of people want to use additional functionality inside their Nextcloud installation. If the image does not include the packages you need, you can easily build your own image on top of it.
+Start your derived image with the `FROM` statement and add whatever you like.
+
+```yaml
+FROM nextcloud:apache
+
+RUN ...
+
+```
+The [examples folder](https://github.com/nextcloud/docker/blob/master/.examples) gives a few examples on how to add certain functionalities, like including the cron job, smb-support or imap-authentication.
+
+If you use your own Dockerfile, you need to configure your docker-compose file accordingly. Switch out the `image` option with `build`. You have to specify the path to your Dockerfile. (in the example it's in the same directory next to the docker-compose file)
+
+```yaml
+ app:
+ build: .
+ links:
+ - db
+ volumes:
+ - data:/var/www/html/data
+ - config:/var/www/html/config
+ - apps:/var/www/html/apps
+ restart: always
+```
+
+If you intend to use another command to run the image, make sure that you set `NEXTCLOUD_UPDATE=1` in your Dockerfile. Otherwise the installation and update will not work.
+
+```yaml
+FROM nextcloud:apache
+
+...
+
+ENV NEXTCLOUD_UPDATE=1
+
+CMD ["/usr/bin/supervisord"]
+```
+
+
+**Updating** your own derived image is also very simple. When a new version of the Nextcloud image is available run:
+
+```console
+docker build -t your-name --pull .
+docker run -d your-name
+```
+
+or for docker-compose:
+```console
+docker-compose build --pull
+docker-compose up -d
+```
+
+The `--pull` option tells docker to look for new versions of the base image. Then the build instructions inside your `Dockerfile` are run on top of the new image.
+
+# Migrating an existing installation
+You're already using Nextcloud and want to switch to docker? Great! Here are some things to look out for:
+
+1. Define your whole Nextcloud infrastructure in a `docker-compose` file and run it with `docker-compose up -d` to get the base installation, volumes and database. Work from there.
+2. Restore your database from a mysqldump (nextcloud\_db\_1 is the name of your db container)
+ - To import from a MySQL dump use the following commands
+ ```console
+ docker cp ./database.dmp nextcloud_db_1:/dmp
+ docker-compose exec db sh -c "mysql -u USER -pPASSWORD nextcloud < /dmp"
+ docker-compose exec db rm /dmp
+ ```
+ - To import from a PostgreSQL dump use to following commands
+ ```console
+ docker cp ./database.dmp nextcloud_db_1:/dmp
+ docker-compose exec db sh -c "psql -U USER --set ON_ERROR_STOP=on nextcloud < /dmp"
+ docker-compose exec db rm /dmp
+ ```
+3. Edit your config.php
+ 1. Set database connection
+ - In case of MySQL database
+ ```php
+ 'dbhost' => 'db:3306',
+ ```
+ - In case of PostgreSQL database
+ ```php
+ 'dbhost' => 'db:5432',
+ ```
+ 2. Make sure you have no configuration for the `apps_paths`. Delete lines like these
+ ```diff
+ - "apps_paths" => array (
+ - 0 => array (
+ - "path" => OC::$SERVERROOT."/apps",
+ - "url" => "/apps",
+ - "writable" => true,
+ - ),
+ ```
+ 3. Make sure to have the `apps` directory non writable and the `custom_apps` directory writable
+ ```php
+ 'apps_paths' => array (
+ 0 => array (
+ 'path' => '/var/www/html/apps',
+ 'url' => '/apps',
+ 'writable' => false,
+ ),
+ 1 => array (
+ 'path' => '/var/www/html/custom_apps',
+ 'url' => '/custom_apps',
+ 'writable' => true,
+ ),
+ ),
+ ```
+ 4. Make sure your data directory is set to /var/www/html/data
+ ```php
+ 'datadirectory' => '/var/www/html/data',
+ ```
+
+
+4. Copy your data (nextcloud_app_1 is the name of your Nextcloud container):
+```console
+docker cp ./data/ nextcloud_app_1:/var/www/html/
+docker-compose exec app chown -R www-data:www-data /var/www/html/data
+docker cp ./theming/ nextcloud_app_1:/var/www/html/
+docker-compose exec app chown -R www-data:www-data /var/www/html/theming
+docker cp ./config/config.php nextcloud_app_1:/var/www/html/config
+docker-compose exec app chown -R www-data:www-data /var/www/html/config
+```
+5. Copy only the custom apps you use (or simply redownload them from the web interface):
+```console
+docker cp ./custom_apps/ nextcloud_data:/var/www/html/
+docker-compose exec app chown -R www-data:www-data /var/www/html/custom_apps
+```
+
+# Questions / Issues
+If you got any questions or problems using the image, please visit our [Github Repository](https://github.com/nextcloud/docker) and write an issue.
diff --git a/linux/advanced/nextcloud/pure/22/docker-compose.yml b/linux/advanced/nextcloud/pure/22/docker-compose.yml
new file mode 100644
index 000000000..1eb96cb2a
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/22/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+ app:
+ image: "epicmorg/nextcloud:22"
+ build:
+ context: .
diff --git a/linux/nextcloud/latest/smb.conf b/linux/advanced/nextcloud/pure/22/smb.conf
similarity index 100%
rename from linux/nextcloud/latest/smb.conf
rename to linux/advanced/nextcloud/pure/22/smb.conf
diff --git a/linux/advanced/nextcloud/pure/22/sources.list b/linux/advanced/nextcloud/pure/22/sources.list
new file mode 100644
index 000000000..5a8c0081a
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/22/sources.list
@@ -0,0 +1,21 @@
+#main
+deb http://httpredir.debian.org/debian/ bullseye main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye main contrib non-free
+deb http://httpredir.debian.org/debian/ bullseye-updates main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye-updates main contrib non-free
+deb http://httpredir.debian.org/debian/ bullseye-backports main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye-backports main contrib non-free
+deb http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib non-free
+
+#security
+deb http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free
+deb-src http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free
+deb http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free
+deb-src http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free
+
+##multimedia
+# deb http://httpredir.debian.org/debian-multimedia/ bullseye main non-free
+# deb-src http://httpredir.debian.org/debian-multimedia/ bullseye main non-free
+# deb http://httpredir.debian.org/debian-multimedia/ bullseye-backports main
+# deb-src http://httpredir.debian.org/debian-multimedia/ bullseye-backports main
diff --git a/linux/advanced/nextcloud/pure/latest/Dockerfile b/linux/advanced/nextcloud/pure/latest/Dockerfile
new file mode 100644
index 000000000..2a74db95c
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/latest/Dockerfile
@@ -0,0 +1,67 @@
+FROM nextcloud:latest
+ENV DEBIAN_FRONTEND noninteractive
+
+##################################################################
+# adding normal sources list
+##################################################################
+RUN rm /etc/apt/sources.list
+COPY sources.list /etc/apt/sources.list
+
+##################################################################
+# adding some utils
+##################################################################
+RUN apt update -y && \
+ apt dist-upgrade -y && \
+ apt install -y --allow-unauthenticated \
+ apt-transport-https \
+ curl \
+ ca-certificates \
+ ghostscript \
+ nload \
+ htop \
+ mc \
+ nano \
+ sudo \
+ imagemagick \
+ imagemagick-common \
+ sqlite3 \
+ smbclient \
+ libsmbclient \
+ wget \
+ net-tools \
+ iputils-ping
+
+##################################################################
+# installing php repo + smbclient
+##################################################################
+RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
+RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list'
+RUN apt update -y && \
+ apt install -y --allow-unauthenticated \
+ libsmbclient-dev \
+ libmagickwand-dev \
+ libmagickcore-dev \
+ libc-client-dev \
+ libkrb5-dev \
+ libsqlite3-dev \
+ libssl-dev
+
+RUN pecl install inotify && \
+ docker-php-ext-enable inotify
+
+RUN pecl install smbclient && \
+ docker-php-ext-enable smbclient
+
+RUN docker-php-ext-configure imap --with-kerberos --with-imap-ssl && \
+ docker-php-ext-install imap && \
+ docker-php-ext-enable imap
+
+RUN docker-php-ext-install fileinfo bz2 intl ftp pdo_sqlite && \
+ docker-php-ext-enable fileinfo bz2 intl ftp pdo_sqlite
+
+##################################################################
+# smb fix
+##################################################################
+RUN rm -frv /etc/samba/smb.conf /usr/share/samba/smb.conf
+ADD smb.conf /etc/samba/
+ADD smb.conf /usr/share/samba/
diff --git a/linux/advanced/nextcloud/pure/latest/Makefile b/linux/advanced/nextcloud/pure/latest/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/latest/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+ make build
+ make deploy
+ make clean
+
+build:
+ docker-compose build --compress --parallel
+
+deploy:
+ docker-compose push
+
+clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
diff --git a/linux/advanced/nextcloud/pure/latest/README.md b/linux/advanced/nextcloud/pure/latest/README.md
new file mode 100644
index 000000000..b6df71808
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/latest/README.md
@@ -0,0 +1,527 @@
+# What is Nextcloud?
+
+[](https://github.com/nextcloud/docker/actions?query=workflow%3AImages)
+[](https://github.com/nextcloud/docker/actions?query=workflow%3Aupdate.sh)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/amd64/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v5/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v6/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm32v7/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/arm64v8/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/i386/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/mips64le/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/ppc64le/job/nextcloud)
+[](https://doi-janky.infosiftr.net/job/multiarch/job/s390x/job/nextcloud)
+
+A safe home for all your data. Access & share your files, calendars, contacts, mail & more from any device, on your terms.
+
+
+
+# How to use this image
+This image is designed to be used in a micro-service environment. There are two versions of the image you can choose from.
+
+The `apache` tag contains a full Nextcloud installation including an apache web server. It is designed to be easy to use and gets you running pretty fast. This is also the default for the `latest` tag and version tags that are not further specified.
+
+The second option is a `fpm` container. It is based on the [php-fpm](https://hub.docker.com/_/php/) image and runs a fastCGI-Process that serves your Nextcloud page. To use this image it must be combined with any webserver that can proxy the http requests to the FastCGI-port of the container.
+
+[](http://play-with-docker.com?stack=https://raw.githubusercontent.com/nextcloud/docker/8db861d67f257a3e9ac1790ea06d4e2a7a193a6c/stack.yml)
+
+## Using the apache image
+The apache image contains a webserver and exposes port 80. To start the container type:
+
+```console
+$ docker run -d -p 8080:80 nextcloud
+```
+
+Now you can access Nextcloud at http://localhost:8080/ from your host system.
+
+
+## Using the fpm image
+To use the fpm image, you need an additional web server that can proxy http-request to the fpm-port of the container. For fpm connection this container exposes port 9000. In most cases, you might want use another container or your host as proxy.
+If you use your host you can address your Nextcloud container directly on port 9000. If you use another container, make sure that you add them to the same docker network (via `docker run --network ...` or a `docker-compose` file).
+In both cases you don't want to map the fpm port to your host.
+
+```console
+$ docker run -d nextcloud:fpm
+```
+
+As the fastCGI-Process is not capable of serving static files (style sheets, images, ...), the webserver needs access to these files. This can be achieved with the `volumes-from` option. You can find more information in the [docker-compose section](#running-this-image-with-docker-compose).
+
+## Using an external database
+By default, this container uses SQLite for data storage but the Nextcloud setup wizard (appears on first run) allows connecting to an existing MySQL/MariaDB or PostgreSQL database. You can also link a database container, e. g. `--link my-mysql:mysql`, and then use `mysql` as the database host on setup. More info is in the docker-compose section.
+
+## Persistent data
+The Nextcloud installation and all data beyond what lives in the database (file uploads, etc) are stored in the [unnamed docker volume](https://docs.docker.com/engine/tutorials/dockervolumes/#adding-a-data-volume) volume `/var/www/html`. The docker daemon will store that data within the docker directory `/var/lib/docker/volumes/...`. That means your data is saved even if the container crashes, is stopped or deleted.
+
+A named Docker volume or a mounted host directory should be used for upgrades and backups. To achieve this, you need one volume for your database container and one for Nextcloud.
+
+Nextcloud:
+- `/var/www/html/` folder where all nextcloud data lives
+```console
+$ docker run -d \
+-v nextcloud:/var/www/html \
+nextcloud
+```
+
+Database:
+- `/var/lib/mysql` MySQL / MariaDB Data
+- `/var/lib/postgresql/data` PostgreSQL Data
+```console
+$ docker run -d \
+-v db:/var/lib/mysql \
+mariadb
+```
+
+If you want to get fine grained access to your individual files, you can mount additional volumes for data, config, your theme and custom apps.
+The `data`, `config` files are stored in respective subfolders inside `/var/www/html/`. The apps are split into core `apps` (which are shipped with Nextcloud and you don't need to take care of) and a `custom_apps` folder. If you use a custom theme it would go into the `themes` subfolder.
+
+Overview of the folders that can be mounted as volumes:
+
+- `/var/www/html` Main folder, needed for updating
+- `/var/www/html/custom_apps` installed / modified apps
+- `/var/www/html/config` local configuration
+- `/var/www/html/data` the actual data of your Nextcloud
+- `/var/www/html/themes/` theming/branding
+
+If you want to use named volumes for all of these, it would look like this:
+```console
+$ docker run -d \
+-v nextcloud:/var/www/html \
+-v apps:/var/www/html/custom_apps \
+-v config:/var/www/html/config \
+-v data:/var/www/html/data \
+-v theme:/var/www/html/themes/ \
+nextcloud
+```
+
+## Using the Nextcloud command-line interface
+To use the [Nextcloud command-line interface](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/occ_command.html) (aka. `occ` command):
+```console
+$ docker exec --user www-data CONTAINER_ID php occ
+```
+or for docker-compose:
+```console
+$ docker-compose exec --user www-data app php occ
+```
+
+## Auto configuration via environment variables
+The nextcloud image supports auto configuration via environment variables. You can preconfigure everything that is asked on the install page on first run. To enable auto configuration, set your database connection via the following environment variables. ONLY use one database type!
+
+__SQLite__:
+- `SQLITE_DATABASE` Name of the database using sqlite
+
+__MYSQL/MariaDB__:
+- `MYSQL_DATABASE` Name of the database using mysql / mariadb.
+- `MYSQL_USER` Username for the database using mysql / mariadb.
+- `MYSQL_PASSWORD` Password for the database user using mysql / mariadb.
+- `MYSQL_HOST` Hostname of the database server using mysql / mariadb.
+
+__PostgreSQL__:
+- `POSTGRES_DB` Name of the database using postgres.
+- `POSTGRES_USER` Username for the database using postgres.
+- `POSTGRES_PASSWORD` Password for the database user using postgres.
+- `POSTGRES_HOST` Hostname of the database server using postgres.
+
+If you set any values, they will not be asked in the install page on first run. With a complete configuration by using all variables for your database type, you can additionally configure your Nextcloud instance by setting admin user and password (only works if you set both):
+
+- `NEXTCLOUD_ADMIN_USER` Name of the Nextcloud admin user.
+- `NEXTCLOUD_ADMIN_PASSWORD` Password for the Nextcloud admin user.
+
+If you want, you can set the data directory, otherwise default value will be used.
+
+- `NEXTCLOUD_DATA_DIR` (default: _/var/www/html/data_) Configures the data directory where nextcloud stores all files from the users.
+
+One or more trusted domains can be set through environment variable, too. They will be added to the configuration after install.
+
+- `NEXTCLOUD_TRUSTED_DOMAINS` (not set by default) Optional space-separated list of domains
+
+The install and update script is only triggered when a default command is used (`apache-foreground` or `php-fpm`). If you use a custom command you have to enable the install / update with
+
+- `NEXTCLOUD_UPDATE` (default: _0_)
+
+If you want to use Redis you have to create a separate [Redis](https://hub.docker.com/_/redis/) container in your setup / in your docker-compose file. To inform Nextcloud about the Redis container, pass in the following parameters:
+
+- `REDIS_HOST` (not set by default) Name of Redis container
+- `REDIS_HOST_PORT` (default: _6379_) Optional port for Redis, only use for external Redis servers that run on non-standard ports.
+- `REDIS_HOST_PASSWORD` (not set by default) Redis password
+
+The use of Redis is recommended to prevent file locking problems. See the examples for further instructions.
+
+To use an external SMTP server, you have to provide the connection details. To configure Nextcloud to use SMTP add:
+
+- `SMTP_HOST` (not set by default): The hostname of the SMTP server.
+- `SMTP_SECURE` (empty by default): Set to `ssl` to use SSL, or `tls` to use STARTTLS.
+- `SMTP_PORT` (default: `465` for SSL and `25` for non-secure connections): Optional port for the SMTP connection. Use `587` for an alternative port for STARTTLS.
+- `SMTP_AUTHTYPE` (default: `LOGIN`): The method used for authentication. Use `PLAIN` if no authentication is required.
+- `SMTP_NAME` (empty by default): The username for the authentication.
+- `SMTP_PASSWORD` (empty by default): The password for the authentication.
+- `MAIL_FROM_ADDRESS` (not set by default): Use this address for the 'from' field in the emails sent by Nextcloud.
+- `MAIL_DOMAIN` (not set by default): Set a different domain for the emails than the domain where Nextcloud is installed.
+
+Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/email_configuration.html) for other values to configure SMTP.
+
+To use an external S3 compatible object store as primary storage, set the following variables:
+- `OBJECTSTORE_S3_HOST`: The hostname of the object storage server
+- `OBJECTSTORE_S3_BUCKET`: The name of the bucket that Nextcloud should store the data in
+- `OBJECTSTORE_S3_KEY`: AWS style access key
+- `OBJECTSTORE_S3_SECRET`: AWS style secret access key
+- `OBJECTSTORE_S3_PORT`: The port that the object storage server is being served over
+- `OBJECTSTORE_S3_SSL` (default: `true`): Whether or not SSL/TLS should be used to communicate with object storage server
+- `OBJECTSTORE_S3_REGION`: The region that the S3 bucket resides in.
+- `OBJECTSTORE_S3_USEPATH_STYLE` (default: `false`): Not required for AWS S3
+
+Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/primary_storage.html#simple-storage-service-s3) for more information.
+
+To use an external OpenStack Swift object store as primary storage, set the following variables:
+- `OBJECTSTORE_SWIFT_URL`: The Swift identity (Keystone) endpoint
+- `OBJECTSTORE_SWIFT_AUTOCREATE` (default: `false`): Whether or not Nextcloud should automatically create the Swift container
+- `OBJECTSTORE_SWIFT_USER_NAME`: Swift username
+- `OBJECTSTORE_SWIFT_USER_PASSWORD`: Swift user password
+- `OBJECTSTORE_SWIFT_USER_DOMAIN` (default: `Default`): Swift user domain
+- `OBJECTSTORE_SWIFT_PROJECT_NAME`: OpenStack project name
+- `OBJECTSTORE_SWIFT_PROJECT_DOMAIN` (default: `Default`): OpenStack project domain
+- `OBJECTSTORE_SWIFT_SERVICE_NAME` (default: `swift`): Swift service name
+- `OBJECTSTORE_SWIFT_SERVICE_REGION`: Swift endpoint region
+- `OBJECTSTORE_SWIFT_CONTAINER_NAME`: Swift container (bucket) that Nextcloud should store the data in
+
+Check the [Nextcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_files/primary_storage.html#openstack-swift) for more information.
+
+
+## Using the apache image behind a reverse proxy and auto configure server host and protocol
+
+The apache image will replace the remote addr (ip address visible to Nextcloud) with the ip address from `X-Real-IP` if the request is coming from a proxy in 10.0.0.0/8, 172.16.0.0/12 or 192.168.0.0/16 by default. If you want Nextcloud to pick up the server host (`HTTP_X_FORWARDED_HOST`), protocol (`HTTP_X_FORWARDED_PROTO`) and client ip (`HTTP_X_FORWARDED_FOR`) from a trusted proxy disable rewrite ip and the reverse proxies ip address to `TRUSTED_PROXIES`.
+
+- `APACHE_DISABLE_REWRITE_IP` (not set by default): Set to 1 to disable rewrite ip.
+
+- `TRUSTED_PROXIES` (empty by default): A space-separated list of trusted proxies. CIDR notation is supported for IPv4.
+
+If the `TRUSTED_PROXIES` approach does not work for you, try using fixed values for overwrite parameters.
+
+- `OVERWRITEHOST` (empty by default): Set the hostname of the proxy. Can also specify a port.
+- `OVERWRITEPROTOCOL` (empty by default): Set the protocol of the proxy, http or https.
+- `OVERWRITEWEBROOT` (empty by default): Set the absolute path of the proxy.
+- `OVERWRITECONDADDR` (empty by default): Regex to overwrite the values dependent on the remote address.
+
+Check the [Nexcloud documentation](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/reverse_proxy_configuration.html) for more details.
+
+Keep in mind that once set, removing these environment variables won't remove these values from the configuration file, due to how Nextcloud merges configuration files together.
+
+# Running this image with docker-compose
+The easiest way to get a fully featured and functional setup is using a `docker-compose` file. There are too many different possibilities to setup your system, so here are only some examples of what you have to look for.
+
+At first, make sure you have chosen the right base image (fpm or apache) and added features you wanted (see below). In every case, you would want to add a database container and docker volumes to get easy access to your persistent data. When you want to have your server reachable from the internet, adding HTTPS-encryption is mandatory! See below for more information.
+
+## Base version - apache
+This version will use the apache image and add a mariaDB container. The volumes are set to keep your data persistent. This setup provides **no ssl encryption** and is intended to run behind a proxy.
+
+Make sure to pass in values for `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` variables before you run this setup.
+
+```yaml
+version: '2'
+
+volumes:
+ nextcloud:
+ db:
+
+services:
+ db:
+ image: mariadb
+ command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+ restart: always
+ volumes:
+ - db:/var/lib/mysql
+ environment:
+ - MYSQL_ROOT_PASSWORD=
+ - MYSQL_PASSWORD=
+ - MYSQL_DATABASE=nextcloud
+ - MYSQL_USER=nextcloud
+
+ app:
+ image: nextcloud
+ ports:
+ - 8080:80
+ links:
+ - db
+ volumes:
+ - nextcloud:/var/www/html
+ restart: always
+
+```
+
+Then run `docker-compose up -d`, now you can access Nextcloud at http://localhost:8080/ from your host system.
+
+## Base version - FPM
+When using the FPM image, you need another container that acts as web server on port 80 and proxies the requests to the Nextcloud container. In this example a simple nginx container is combined with the Nextcloud-fpm image and a MariaDB database container. The data is stored in docker volumes. The nginx container also needs access to static files from your Nextcloud installation. It gets access to all the volumes mounted to Nextcloud via the `volumes_from` option.The configuration for nginx is stored in the configuration file `nginx.conf`, that is mounted into the container. An example can be found in the examples section [here](https://github.com/nextcloud/docker/tree/master/.examples).
+
+As this setup does **not include encryption**, it should be run behind a proxy.
+
+Make sure to pass in values for `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` variables before you run this setup.
+
+```yaml
+version: '2'
+
+volumes:
+ nextcloud:
+ db:
+
+services:
+ db:
+ image: mariadb
+ command: --transaction-isolation=READ-COMMITTED --binlog-format=ROW
+ restart: always
+ volumes:
+ - db:/var/lib/mysql
+ environment:
+ - MYSQL_ROOT_PASSWORD=
+ - MYSQL_PASSWORD=
+ - MYSQL_DATABASE=nextcloud
+ - MYSQL_USER=nextcloud
+
+ app:
+ image: nextcloud:fpm
+ links:
+ - db
+ volumes:
+ - nextcloud:/var/www/html
+ restart: always
+
+ web:
+ image: nginx
+ ports:
+ - 8080:80
+ links:
+ - app
+ volumes:
+ - ./nginx.conf:/etc/nginx/nginx.conf:ro
+ volumes_from:
+ - app
+ restart: always
+```
+
+Then run `docker-compose up -d`, now you can access Nextcloud at http://localhost:8080/ from your host system.
+
+# Docker Secrets
+As an alternative to passing sensitive information via environment variables, _FILE may be appended to the previously listed environment variables, causing the initialization script to load the values for those variables from files present in the container. In particular, this can be used to load passwords from Docker secrets stored in /run/secrets/ files. For example:
+```yaml
+version: '3.2'
+
+services:
+ db:
+ image: postgres
+ restart: always
+ volumes:
+ - db:/var/lib/postgresql/data
+ environment:
+ - POSTGRES_DB_FILE=/run/secrets/postgres_db
+ - POSTGRES_USER_FILE=/run/secrets/postgres_user
+ - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
+ secrets:
+ - postgres_db
+ - postgres_password
+ - postgres_user
+
+ app:
+ image: nextcloud
+ restart: always
+ ports:
+ - 8080:80
+ volumes:
+ - nextcloud:/var/www/html
+ environment:
+ - POSTGRES_HOST=db
+ - POSTGRES_DB_FILE=/run/secrets/postgres_db
+ - POSTGRES_USER_FILE=/run/secrets/postgres_user
+ - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
+ - NEXTCLOUD_ADMIN_PASSWORD_FILE=/run/secrets/nextcloud_admin_password
+ - NEXTCLOUD_ADMIN_USER_FILE=/run/secrets/nextcloud_admin_user
+ depends_on:
+ - db
+ secrets:
+ - nextcloud_admin_password
+ - nextcloud_admin_user
+ - postgres_db
+ - postgres_password
+ - postgres_user
+
+volumes:
+ db:
+ nextcloud:
+
+secrets:
+ nextcloud_admin_password:
+ file: ./nextcloud_admin_password.txt # put admin password to this file
+ nextcloud_admin_user:
+ file: ./nextcloud_admin_user.txt # put admin username to this file
+ postgres_db:
+ file: ./postgres_db.txt # put postgresql db name to this file
+ postgres_password:
+ file: ./postgres_password.txt # put postgresql password to this file
+ postgres_user:
+ file: ./postgres_user.txt # put postgresql username to this file
+```
+
+Currently, this is only supported for `NEXTCLOUD_ADMIN_PASSWORD`, `NEXTCLOUD_ADMIN_USER`, `MYSQL_DB`, `MYSQL_PASSWORD`, `MYSQL_USER`, `POSTGRES_DB`, `POSTGRES_PASSWORD`, `POSTGRES_USER`.
+
+# Make your Nextcloud available from the internet
+Until here, your Nextcloud is just available from you docker host. If you want your Nextcloud available from the internet adding SSL encryption is mandatory.
+
+## HTTPS - SSL encryption
+There are many different possibilities to introduce encryption depending on your setup.
+
+We recommend using a reverse proxy in front of our Nextcloud installation. Your Nextcloud will only be reachable through the proxy, which encrypts all traffic to the clients. You can mount your manually generated certificates to the proxy or use a fully automated solution which generates and renews the certificates for you.
+
+In our [examples](https://github.com/nextcloud/docker/tree/master/.examples) section we have an example for a fully automated setup using a reverse proxy, a container for [Let's Encrypt](https://letsencrypt.org/) certificate handling, database and Nextcloud. It uses the popular [nginx-proxy](https://github.com/jwilder/nginx-proxy) and [docker-letsencrypt-nginx-proxy-companion](https://github.com/JrCs/docker-letsencrypt-nginx-proxy-companion) containers. Please check the according documentations before using this setup.
+
+# First use
+When you first access your Nextcloud, the setup wizard will appear and ask you to choose an administrator account username, password and the database connection. For the database use `db` as host and `nextcloud` as table and user name. Also enter the password you chose in your `docker-compose.yml` file.
+
+# Update to a newer version
+Updating the Nextcloud container is done by pulling the new image, throwing away the old container and starting the new one.
+
+**It is only possible to upgrade one major version at a time. For example, if you want to upgrade from version 14 to 16, you will have to upgrade from version 14 to 15, then from 15 to 16.**
+
+Since all data is stored in volumes, nothing gets lost. The startup script will check for the version in your volume and the installed docker version. If it finds a mismatch, it automatically starts the upgrade process. Don't forget to add all the volumes to your new container, so it works as expected.
+
+```console
+$ docker pull nextcloud
+$ docker stop
+$ docker rm
+$ docker run -d nextcloud
+```
+Beware that you have to run the same command with the options that you used to initially start your Nextcloud. That includes volumes, port mapping.
+
+When using docker-compose your compose file takes care of your configuration, so you just have to run:
+
+```console
+$ docker-compose pull
+$ docker-compose up -d
+```
+
+
+# Adding Features
+A lot of people want to use additional functionality inside their Nextcloud installation. If the image does not include the packages you need, you can easily build your own image on top of it.
+Start your derived image with the `FROM` statement and add whatever you like.
+
+```yaml
+FROM nextcloud:apache
+
+RUN ...
+
+```
+The [examples folder](https://github.com/nextcloud/docker/blob/master/.examples) gives a few examples on how to add certain functionalities, like including the cron job, smb-support or imap-authentication.
+
+If you use your own Dockerfile, you need to configure your docker-compose file accordingly. Switch out the `image` option with `build`. You have to specify the path to your Dockerfile. (in the example it's in the same directory next to the docker-compose file)
+
+```yaml
+ app:
+ build: .
+ links:
+ - db
+ volumes:
+ - data:/var/www/html/data
+ - config:/var/www/html/config
+ - apps:/var/www/html/apps
+ restart: always
+```
+
+If you intend to use another command to run the image, make sure that you set `NEXTCLOUD_UPDATE=1` in your Dockerfile. Otherwise the installation and update will not work.
+
+```yaml
+FROM nextcloud:apache
+
+...
+
+ENV NEXTCLOUD_UPDATE=1
+
+CMD ["/usr/bin/supervisord"]
+```
+
+
+**Updating** your own derived image is also very simple. When a new version of the Nextcloud image is available run:
+
+```console
+docker build -t your-name --pull .
+docker run -d your-name
+```
+
+or for docker-compose:
+```console
+docker-compose build --pull
+docker-compose up -d
+```
+
+The `--pull` option tells docker to look for new versions of the base image. Then the build instructions inside your `Dockerfile` are run on top of the new image.
+
+# Migrating an existing installation
+You're already using Nextcloud and want to switch to docker? Great! Here are some things to look out for:
+
+1. Define your whole Nextcloud infrastructure in a `docker-compose` file and run it with `docker-compose up -d` to get the base installation, volumes and database. Work from there.
+2. Restore your database from a mysqldump (nextcloud\_db\_1 is the name of your db container)
+ - To import from a MySQL dump use the following commands
+ ```console
+ docker cp ./database.dmp nextcloud_db_1:/dmp
+ docker-compose exec db sh -c "mysql -u USER -pPASSWORD nextcloud < /dmp"
+ docker-compose exec db rm /dmp
+ ```
+ - To import from a PostgreSQL dump use to following commands
+ ```console
+ docker cp ./database.dmp nextcloud_db_1:/dmp
+ docker-compose exec db sh -c "psql -U USER --set ON_ERROR_STOP=on nextcloud < /dmp"
+ docker-compose exec db rm /dmp
+ ```
+3. Edit your config.php
+ 1. Set database connection
+ - In case of MySQL database
+ ```php
+ 'dbhost' => 'db:3306',
+ ```
+ - In case of PostgreSQL database
+ ```php
+ 'dbhost' => 'db:5432',
+ ```
+ 2. Make sure you have no configuration for the `apps_paths`. Delete lines like these
+ ```diff
+ - "apps_paths" => array (
+ - 0 => array (
+ - "path" => OC::$SERVERROOT."/apps",
+ - "url" => "/apps",
+ - "writable" => true,
+ - ),
+ ```
+ 3. Make sure to have the `apps` directory non writable and the `custom_apps` directory writable
+ ```php
+ 'apps_paths' => array (
+ 0 => array (
+ 'path' => '/var/www/html/apps',
+ 'url' => '/apps',
+ 'writable' => false,
+ ),
+ 1 => array (
+ 'path' => '/var/www/html/custom_apps',
+ 'url' => '/custom_apps',
+ 'writable' => true,
+ ),
+ ),
+ ```
+ 4. Make sure your data directory is set to /var/www/html/data
+ ```php
+ 'datadirectory' => '/var/www/html/data',
+ ```
+
+
+4. Copy your data (nextcloud_app_1 is the name of your Nextcloud container):
+```console
+docker cp ./data/ nextcloud_app_1:/var/www/html/
+docker-compose exec app chown -R www-data:www-data /var/www/html/data
+docker cp ./theming/ nextcloud_app_1:/var/www/html/
+docker-compose exec app chown -R www-data:www-data /var/www/html/theming
+docker cp ./config/config.php nextcloud_app_1:/var/www/html/config
+docker-compose exec app chown -R www-data:www-data /var/www/html/config
+```
+5. Copy only the custom apps you use (or simply redownload them from the web interface):
+```console
+docker cp ./custom_apps/ nextcloud_data:/var/www/html/
+docker-compose exec app chown -R www-data:www-data /var/www/html/custom_apps
+```
+
+# Questions / Issues
+If you got any questions or problems using the image, please visit our [Github Repository](https://github.com/nextcloud/docker) and write an issue.
diff --git a/linux/advanced/nextcloud/pure/latest/docker-compose.yml b/linux/advanced/nextcloud/pure/latest/docker-compose.yml
new file mode 100644
index 000000000..ec811fc63
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/latest/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+ app:
+ image: "epicmorg/nextcloud:latest"
+ build:
+ context: .
diff --git a/linux/advanced/nextcloud/pure/latest/smb.conf b/linux/advanced/nextcloud/pure/latest/smb.conf
new file mode 100644
index 000000000..9346a22f4
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/latest/smb.conf
@@ -0,0 +1,239 @@
+#
+# Sample configuration file for the Samba suite for Debian GNU/Linux.
+#
+#
+# This is the main Samba configuration file. You should read the
+# smb.conf(5) manual page in order to understand the options listed
+# here. Samba has a huge number of configurable options most of which
+# are not shown in this example
+#
+# Some options that are often worth tuning have been included as
+# commented-out examples in this file.
+# - When such options are commented with ";", the proposed setting
+# differs from the default Samba behaviour
+# - When commented with "#", the proposed setting is the default
+# behaviour of Samba but the option is considered important
+# enough to be mentioned here
+#
+# NOTE: Whenever you modify this file you should run the command
+# "testparm" to check that you have not made any basic syntactic
+# errors.
+
+#======================= Global Settings =======================
+
+[global]
+client min protocol = SMB2
+client max protocol = SMB3
+
+
+## Browsing/Identification ###
+
+# Change this to the workgroup/NT-domain name your Samba server will part of
+ workgroup = WORKGROUP
+
+#### Networking ####
+
+# The specific set of interfaces / networks to bind to
+# This can be either the interface name or an IP address/netmask;
+# interface names are normally preferred
+; interfaces = 127.0.0.0/8 eth0
+
+# Only bind to the named interfaces and/or networks; you must use the
+# 'interfaces' option above to use this.
+# It is recommended that you enable this feature if your Samba machine is
+# not protected by a firewall or is a firewall itself. However, this
+# option cannot handle dynamic or non-broadcast interfaces correctly.
+; bind interfaces only = yes
+
+
+
+#### Debugging/Accounting ####
+
+# This tells Samba to use a separate log file for each machine
+# that connects
+ log file = /var/log/samba/log.%m
+
+# Cap the size of the individual log files (in KiB).
+ max log size = 1000
+
+# We want Samba to only log to /var/log/samba/log.{smbd,nmbd}.
+# Append syslog@1 if you want important messages to be sent to syslog too.
+ logging = file
+
+# Do something sensible when Samba crashes: mail the admin a backtrace
+ panic action = /usr/share/samba/panic-action %d
+
+
+####### Authentication #######
+
+# Server role. Defines in which mode Samba will operate. Possible
+# values are "standalone server", "member server", "classic primary
+# domain controller", "classic backup domain controller", "active
+# directory domain controller".
+#
+# Most people will want "standalone server" or "member server".
+# Running as "active directory domain controller" will require first
+# running "samba-tool domain provision" to wipe databases and create a
+# new domain.
+ server role = standalone server
+
+ obey pam restrictions = yes
+
+# This boolean parameter controls whether Samba attempts to sync the Unix
+# password with the SMB password when the encrypted SMB password in the
+# passdb is changed.
+ unix password sync = yes
+
+# For Unix password sync to work on a Debian GNU/Linux system, the following
+# parameters must be set (thanks to Ian Kahan < for
+# sending the correct chat script for the passwd program in Debian Sarge).
+ passwd program = /usr/bin/passwd %u
+ passwd chat = *Enter\snew\s*\spassword:* %n\n *Retype\snew\s*\spassword:* %n\n *password\supdated\ssuccessfully* .
+
+# This boolean controls whether PAM will be used for password changes
+# when requested by an SMB client instead of the program listed in
+# 'passwd program'. The default is 'no'.
+ pam password change = yes
+
+# This option controls how unsuccessful authentication attempts are mapped
+# to anonymous connections
+ map to guest = bad user
+
+########## Domains ###########
+
+#
+# The following settings only takes effect if 'server role = primary
+# classic domain controller', 'server role = backup domain controller'
+# or 'domain logons' is set
+#
+
+# It specifies the location of the user's
+# profile directory from the client point of view) The following
+# required a [profiles] share to be setup on the samba server (see
+# below)
+; logon path = \\%N\profiles\%U
+# Another common choice is storing the profile in the user's home directory
+# (this is Samba's default)
+# logon path = \\%N\%U\profile
+
+# The following setting only takes effect if 'domain logons' is set
+# It specifies the location of a user's home directory (from the client
+# point of view)
+; logon drive = H:
+# logon home = \\%N\%U
+
+# The following setting only takes effect if 'domain logons' is set
+# It specifies the script to run during logon. The script must be stored
+# in the [netlogon] share
+# NOTE: Must be store in 'DOS' file format convention
+; logon script = logon.cmd
+
+# This allows Unix users to be created on the domain controller via the SAMR
+# RPC pipe. The example command creates a user account with a disabled Unix
+# password; please adapt to your needs
+; add user script = /usr/sbin/adduser --quiet --disabled-password --gecos "" %u
+
+# This allows machine accounts to be created on the domain controller via the
+# SAMR RPC pipe.
+# The following assumes a "machines" group exists on the system
+; add machine script = /usr/sbin/useradd -g machines -c "%u machine account" -d /var/lib/samba -s /bin/false %u
+
+# This allows Unix groups to be created on the domain controller via the SAMR
+# RPC pipe.
+; add group script = /usr/sbin/addgroup --force-badname %g
+
+############ Misc ############
+
+# Using the following line enables you to customise your configuration
+# on a per machine basis. The %m gets replaced with the netbios name
+# of the machine that is connecting
+; include = /home/samba/etc/smb.conf.%m
+
+# Some defaults for winbind (make sure you're not using the ranges
+# for something else.)
+; idmap config * : backend = tdb
+; idmap config * : range = 3000-7999
+; idmap config YOURDOMAINHERE : backend = tdb
+; idmap config YOURDOMAINHERE : range = 100000-999999
+; template shell = /bin/bash
+
+# Setup usershare options to enable non-root users to share folders
+# with the net usershare command.
+
+# Maximum number of usershare. 0 means that usershare is disabled.
+# usershare max shares = 100
+
+# Allow users who've been granted usershare privileges to create
+# public shares, not just authenticated ones
+ usershare allow guests = yes
+
+#======================= Share Definitions =======================
+
+[homes]
+ comment = Home Directories
+ browseable = no
+
+# By default, the home directories are exported read-only. Change the
+# next parameter to 'no' if you want to be able to write to them.
+ read only = yes
+
+# File creation mask is set to 0700 for security reasons. If you want to
+# create files with group=rw permissions, set next parameter to 0775.
+ create mask = 0700
+
+# Directory creation mask is set to 0700 for security reasons. If you want to
+# create dirs. with group=rw permissions, set next parameter to 0775.
+ directory mask = 0700
+
+# By default, \\server\username shares can be connected to by anyone
+# with access to the samba server.
+# The following parameter makes sure that only "username" can connect
+# to \\server\username
+# This might need tweaking when using external authentication schemes
+ valid users = %S
+
+# Un-comment the following and create the netlogon directory for Domain Logons
+# (you need to configure Samba to act as a domain controller too.)
+;[netlogon]
+; comment = Network Logon Service
+; path = /home/samba/netlogon
+; guest ok = yes
+; read only = yes
+
+# Un-comment the following and create the profiles directory to store
+# users profiles (see the "logon path" option above)
+# (you need to configure Samba to act as a domain controller too.)
+# The path below should be writable by all users so that their
+# profile directory may be created the first time they log on
+;[profiles]
+; comment = Users profiles
+; path = /home/samba/profiles
+; guest ok = no
+; browseable = no
+; create mask = 0600
+; directory mask = 0700
+
+[printers]
+ comment = All Printers
+ browseable = no
+ path = /var/spool/samba
+ printable = yes
+ guest ok = no
+ read only = yes
+ create mask = 0700
+
+# Windows clients look for this share name as a source of downloadable
+# printer drivers
+[print$]
+ comment = Printer Drivers
+ path = /var/lib/samba/printers
+ browseable = yes
+ read only = yes
+ guest ok = no
+# Uncomment to allow remote administration of Windows print drivers.
+# You may need to replace 'lpadmin' with the name of the group your
+# admin users are members of.
+# Please note that you also need to set appropriate Unix permissions
+# to the drivers directory for these users to have write rights in it
+; write list = root, @lpadmin
+
diff --git a/linux/advanced/nextcloud/pure/latest/sources.list b/linux/advanced/nextcloud/pure/latest/sources.list
new file mode 100644
index 000000000..5a8c0081a
--- /dev/null
+++ b/linux/advanced/nextcloud/pure/latest/sources.list
@@ -0,0 +1,21 @@
+#main
+deb http://httpredir.debian.org/debian/ bullseye main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye main contrib non-free
+deb http://httpredir.debian.org/debian/ bullseye-updates main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye-updates main contrib non-free
+deb http://httpredir.debian.org/debian/ bullseye-backports main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye-backports main contrib non-free
+deb http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib non-free
+deb-src http://httpredir.debian.org/debian/ bullseye-proposed-updates main contrib non-free
+
+#security
+deb http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free
+deb-src http://httpredir.debian.org/debian-security/ bullseye-security main contrib non-free
+deb http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free
+deb-src http://httpredir.debian.org/debian-security/ bullseye-security/updates main contrib non-free
+
+##multimedia
+# deb http://httpredir.debian.org/debian-multimedia/ bullseye main non-free
+# deb-src http://httpredir.debian.org/debian-multimedia/ bullseye main non-free
+# deb http://httpredir.debian.org/debian-multimedia/ bullseye-backports main
+# deb-src http://httpredir.debian.org/debian-multimedia/ bullseye-backports main
diff --git a/linux/advanced/redash/Makefile b/linux/advanced/redash/Makefile
new file mode 100644
index 000000000..dbd815f41
--- /dev/null
+++ b/linux/advanced/redash/Makefile
@@ -0,0 +1,30 @@
+all: app
+
+app:
+ make sync
+ make patch
+ make build
+ make deploy
+ make clean
+
+sync:
+ rm -rfv redash-repo
+ git submodule init
+ git submodule update --init --recursive
+ git submodule sync --recursive
+
+patch:
+ sed -i -e 's/# ldap3==2.2.4/ldap3==2.2.4/g' ./redash-repo/requirements.txt
+
+build:
+ docker-compose build --compress --parallel
+
+deploy:
+ docker-compose push
+
+clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
diff --git a/linux/advanced/redash/README.md b/linux/advanced/redash/README.md
new file mode 100644
index 000000000..46d44d203
--- /dev/null
+++ b/linux/advanced/redash/README.md
@@ -0,0 +1,98 @@
+
+ 
+
+
+[](https://redash.io/help/)
+[](https://datree.io/?src=badge)
+[](https://circleci.com/gh/getredash/redash/tree/master)
+
+Redash is designed to enable anyone, regardless of the level of technical sophistication, to harness the power of data big and small. SQL users leverage Redash to explore, query, visualize, and share data from any data sources. Their work in turn enables anybody in their organization to use the data. Every day, millions of users at thousands of organizations around the world use Redash to develop insights and make data-driven decisions.
+
+Redash features:
+
+1. **Browser-based**: Everything in your browser, with a shareable URL.
+2. **Ease-of-use**: Become immediately productive with data without the need to master complex software.
+3. **Query editor**: Quickly compose SQL and NoSQL queries with a schema browser and auto-complete.
+4. **Visualization and dashboards**: Create [beautiful visualizations](https://redash.io/help/user-guide/visualizations/visualization-types) with drag and drop, and combine them into a single dashboard.
+5. **Sharing**: Collaborate easily by sharing visualizations and their associated queries, enabling peer review of reports and queries.
+6. **Schedule refreshes**: Automatically update your charts and dashboards at regular intervals you define.
+7. **Alerts**: Define conditions and be alerted instantly when your data changes.
+8. **REST API**: Everything that can be done in the UI is also available through REST API.
+9. **Broad support for data sources**: Extensible data source API with native support for a long list of common databases and platforms.
+
+
+
+## Getting Started
+
+* [Setting up Redash instance](https://redash.io/help/open-source/setup) (includes links to ready-made AWS/GCE images).
+* [Documentation](https://redash.io/help/).
+
+## Supported Data Sources
+
+Redash supports more than 35 SQL and NoSQL [data sources](https://redash.io/help/data-sources/supported-data-sources). It can also be extended to support more. Below is a list of built-in sources:
+
+- Amazon Athena
+- Amazon DynamoDB
+- Amazon Redshift
+- Axibase Time Series Database
+- Cassandra
+- ClickHouse
+- CockroachDB
+- CSV
+- Databricks (Apache Spark)
+- DB2 by IBM
+- Druid
+- Elasticsearch
+- Google Analytics
+- Google BigQuery
+- Google Spreadsheets
+- Graphite
+- Greenplum
+- Hive
+- Impala
+- InfluxDB
+- JIRA
+- JSON
+- Apache Kylin
+- OmniSciDB (Formerly MapD)
+- MemSQL
+- Microsoft Azure Data Warehouse / Synapse
+- Microsoft Azure SQL Database
+- Microsoft SQL Server
+- MongoDB
+- MySQL
+- Oracle
+- PostgreSQL
+- Presto
+- Prometheus
+- Python
+- Qubole
+- Rockset
+- Salesforce
+- ScyllaDB
+- Shell Scripts
+- Snowflake
+- SQLite
+- TiDB
+- TreasureData
+- Vertica
+- Yandex AppMetrrica
+- Yandex Metrica
+
+## Getting Help
+
+* Issues: https://github.com/getredash/redash/issues
+* Discussion Forum: https://discuss.redash.io/
+
+## Reporting Bugs and Contributing Code
+
+* Want to report a bug or request a feature? Please open [an issue](https://github.com/getredash/redash/issues/new).
+* Want to help us build **_Redash_**? Fork the project, edit in a [dev environment](https://redash.io/help-onpremise/dev/guide.html) and make a pull request. We need all the help we can get!
+
+## Security
+
+Please email security@redash.io to report any security vulnerabilities. We will acknowledge receipt of your vulnerability and strive to send you regular updates about our progress. If you're curious about the status of your disclosure please feel free to email us again. If you want to encrypt your disclosure email, you can use [this PGP key](https://keybase.io/arikfr/key.asc).
+
+## License
+
+BSD-2-Clause.
diff --git a/linux/advanced/redash/docker-compose.example.yml b/linux/advanced/redash/docker-compose.example.yml
new file mode 100644
index 000000000..82bcd245f
--- /dev/null
+++ b/linux/advanced/redash/docker-compose.example.yml
@@ -0,0 +1,65 @@
+# This configuration file is for the **development** setup.
+# For a production example please refer to getredash/setup repository on GitHub.
+version: "2.2"
+x-redash-service: &redash-service
+ build:
+ context: .
+ args:
+ skip_frontend_build: "true"
+ volumes:
+ - .:/app
+x-redash-environment: &redash-environment
+ REDASH_LOG_LEVEL: "INFO"
+ REDASH_REDIS_URL: "redis://redis:6379/0"
+ REDASH_DATABASE_URL: "postgresql://postgres@postgres/postgres"
+ REDASH_RATELIMIT_ENABLED: "false"
+ REDASH_MAIL_DEFAULT_SENDER: "redash@example.com"
+ REDASH_MAIL_SERVER: "email"
+ REDASH_ENFORCE_CSRF: "true"
+services:
+ server:
+ <<: *redash-service
+ command: dev_server
+ depends_on:
+ - postgres
+ - redis
+ ports:
+ - "5000:5000"
+ - "5678:5678"
+ environment:
+ <<: *redash-environment
+ PYTHONUNBUFFERED: 0
+ scheduler:
+ <<: *redash-service
+ command: dev_scheduler
+ depends_on:
+ - server
+ environment:
+ <<: *redash-environment
+ worker:
+ <<: *redash-service
+ command: dev_worker
+ depends_on:
+ - server
+ environment:
+ <<: *redash-environment
+ PYTHONUNBUFFERED: 0
+ redis:
+ image: redis:3-alpine
+ restart: unless-stopped
+ postgres:
+ image: postgres:9.5-alpine
+ # The following turns the DB into less durable, but gains significant performance improvements for the tests run (x3
+ # improvement on my personal machine). We should consider moving this into a dedicated Docker Compose configuration for
+ # tests.
+ ports:
+ - "15432:5432"
+ command: "postgres -c fsync=off -c full_page_writes=off -c synchronous_commit=OFF"
+ restart: unless-stopped
+ environment:
+ POSTGRES_HOST_AUTH_METHOD: "trust"
+ email:
+ image: djfarrelly/maildev
+ ports:
+ - "1080:80"
+ restart: unless-stopped
diff --git a/linux/advanced/redash/docker-compose.yml b/linux/advanced/redash/docker-compose.yml
new file mode 100644
index 000000000..814119cd5
--- /dev/null
+++ b/linux/advanced/redash/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+ app:
+ image: "epicmorg/redash:latest"
+ build:
+ context: ./redash-repo
diff --git a/linux/advanced/redash/redash-repo b/linux/advanced/redash/redash-repo
new file mode 160000
index 000000000..2e67227f1
--- /dev/null
+++ b/linux/advanced/redash/redash-repo
@@ -0,0 +1 @@
+Subproject commit 2e67227f1bb6068c3f23bc044ad76ef7d4bccdc7
diff --git a/linux/teamcity/README.md b/linux/advanced/teamcity/README.md
similarity index 100%
rename from linux/teamcity/README.md
rename to linux/advanced/teamcity/README.md
diff --git a/linux/teamcity/server/Dockerfile b/linux/advanced/teamcity/server/Dockerfile
similarity index 100%
rename from linux/teamcity/server/Dockerfile
rename to linux/advanced/teamcity/server/Dockerfile
diff --git a/linux/advanced/teamcity/server/Makefile b/linux/advanced/teamcity/server/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/advanced/teamcity/server/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+ make build
+ make deploy
+ make clean
+
+build:
+ docker-compose build --compress --parallel
+
+deploy:
+ docker-compose push
+
+clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
diff --git a/linux/teamcity/server/README.md b/linux/advanced/teamcity/server/README.md
similarity index 100%
rename from linux/teamcity/server/README.md
rename to linux/advanced/teamcity/server/README.md
diff --git a/linux/advanced/teamcity/server/docker-compose.yml b/linux/advanced/teamcity/server/docker-compose.yml
new file mode 100644
index 000000000..ca5f2ec95
--- /dev/null
+++ b/linux/advanced/teamcity/server/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+ app:
+ image: "epicmorg/teamcity-server:latest"
+ build:
+ context: .
diff --git a/linux/epicmorg/prod/main/locale.gen b/linux/advanced/teamcity/server/locale.gen
similarity index 100%
rename from linux/epicmorg/prod/main/locale.gen
rename to linux/advanced/teamcity/server/locale.gen
diff --git a/linux/epicmorg/prod/main/locale.gen.full b/linux/advanced/teamcity/server/locale.gen.full
similarity index 100%
rename from linux/epicmorg/prod/main/locale.gen.full
rename to linux/advanced/teamcity/server/locale.gen.full
diff --git a/linux/teamcity/server/sources.list b/linux/advanced/teamcity/server/sources.list
similarity index 100%
rename from linux/teamcity/server/sources.list
rename to linux/advanced/teamcity/server/sources.list
diff --git a/linux/advanced/vscode-server/amxx/Dockerfile b/linux/advanced/vscode-server/amxx/Dockerfile
new file mode 100644
index 000000000..cb4a5ba9f
--- /dev/null
+++ b/linux/advanced/vscode-server/amxx/Dockerfile
@@ -0,0 +1,55 @@
+################################################################################
+# https://github.com/linuxserver/docker-code-server/pkgs/container/code-server
+################################################################################
+FROM epicmorg/vscode-server:latest
+
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+# ARGuments
+##################################################################
+ENV BuildDocker true
+
+##################################################################
+# AMXXModX setup
+##################################################################
+#
+# Reserved for future
+# export AMXX_CSTRIKE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-cstrike-linux` && \
+# export AMXX_DOD_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-dod-linux` && \
+# export AMXX_ESF_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-esf-linux` && \
+# export AMXX_NS_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-ns-linux` && \
+# export AMXX_TFC_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-tfc-linux` && \
+# export AMXX_TS_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-base-linux` && \
+#
+# Install packages
+ENV AMXX_VERSION=1.9
+ENV AMXX_INSTALL_PATH=/opt/amxmodx/$AMXX_VERSION
+ENV AMXX_BIN_PATH=$AMXX_INSTALL_PATH/scripting
+ENV PATH=$PATH:$AMXX_BIN_PATH
+ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$AMXX_BIN_PATH
+
+RUN export AMXX_BASE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-base-linux` && \
+ mkdir -p $AMXX_INSTALL_PATH && \
+ curl -SL https://www.amxmodx.org/amxxdrop/{$AMXX_VERSION}/{$AMXX_BASE_LATEST_VERSION} -o /tmp/amxx_base_latest.tar.gz && \
+ cd /tmp && tar -zxf /tmp/amxx_base_latest.tar.gz && cd / && \
+ mv -f /tmp/addons/amxmodx/* $AMXX_INSTALL_PATH && \
+ chmod +x $AMXX_BIN_PATH/amxxpc && \
+ chmod +x $AMXX_BIN_PATH/compile.sh
+
+##################################################################
+# cleaninig up
+##################################################################
+RUN apt purge policykit-1 -y && \
+ apt clean -y && \
+ apt autoclean -y && \
+ rm -rfv /var/lib/apt/lists/* && \
+ rm -rfv /tmp/mc.patch && \
+ rm -rfv /var/cache/apt/archives/*.deb && \
+ rm -rfv /tmp/7z && \
+ rm -rfv /tmp/deb/* && \
+ rm -rfv /tmp/composer-setup.php && \
+ rm -rfv /tmp/amxx_base_latest.tar.gz && \
+ rm -rfv /tmp/atlassian-plugin-sdk.deb && \
+ rm -rfv /tmp/addons
diff --git a/linux/advanced/vscode-server/amxx/Makefile b/linux/advanced/vscode-server/amxx/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/advanced/vscode-server/amxx/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+ make build
+ make deploy
+ make clean
+
+build:
+ docker-compose build --compress --parallel
+
+deploy:
+ docker-compose push
+
+clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
diff --git a/linux/advanced/vscode-server/amxx/docker-compose.yml b/linux/advanced/vscode-server/amxx/docker-compose.yml
new file mode 100644
index 000000000..de97728ff
--- /dev/null
+++ b/linux/advanced/vscode-server/amxx/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+ app:
+ image: "epicmorg/vscode-server:amxx"
+ build:
+ context: .
diff --git a/linux/advanced/vscode-server/android/Dockerfile b/linux/advanced/vscode-server/android/Dockerfile
new file mode 100644
index 000000000..333c8af26
--- /dev/null
+++ b/linux/advanced/vscode-server/android/Dockerfile
@@ -0,0 +1,74 @@
+################################################################################
+# https://github.com/linuxserver/docker-code-server/pkgs/container/code-server
+################################################################################
+FROM epicmorg/vscode-server:latest
+
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+# ARGuments
+##################################################################
+ENV BuildDocker true
+
+##################################################################
+# Android SDK
+##################################################################
+ENV ANDROID_HOME=/usr/lib/android-sdk
+ENV ANDROID_SDK_ROOT=/usr/lib/android-sdk
+
+RUN apt update && \
+ apt install -y --allow-unauthenticated \
+ android-sdk \
+ android-sdk-build-tools \
+ android-sdk-platform-tools-common \
+ android-sdk-platform-tools \
+ adb fastboot f2fs-tools e2fsprogs libsqlite3-0 sqlite3
+
+# Activate android sdk
+RUN echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > /usr/lib/android-sdk/licenses/android-sdk-license
+
+##################################################################
+# SDKMAN
+##################################################################
+#USER root
+#RUN export SDKMAN_DIR="/usr/local/sdkman" && curl -s "https://get.sdkman.io?rcupdate=false" | bash
+RUN export SDKMAN_DIR="/config/.sdkman" && curl -s "https://get.sdkman.io" | bash
+
+##################################################################
+# Gradle
+##################################################################
+RUN /bin/bash -c "source /config/.sdkman/bin/sdkman-init.sh; sdk install gradle;"
+
+##################################################################
+# Kotlin
+##################################################################
+RUN /bin/bash -c "source /config/.sdkman/bin/sdkman-init.sh; sdk install kotlin;"
+
+##################################################################
+# installing java11
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \
+ echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ focal main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+ apt-get update && \
+ apt-get autoremove -y && \
+ apt-get install -y --allow-unauthenticated adoptopenjdk-11-hotspot && \
+ mkdir /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre && \
+ ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/bin && \
+ ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/lib
+
+##################################################################
+# cleaninig up
+##################################################################
+RUN apt purge policykit-1 -y && \
+ apt clean -y && \
+ apt autoclean -y && \
+ rm -rfv /var/lib/apt/lists/* && \
+ rm -rfv /tmp/mc.patch && \
+ rm -rfv /var/cache/apt/archives/*.deb && \
+ rm -rfv /tmp/7z && \
+ rm -rfv /tmp/deb/* && \
+ rm -rfv /tmp/composer-setup.php && \
+ rm -rfv /tmp/amxx_base_latest.tar.gz && \
+ rm -rfv /tmp/atlassian-plugin-sdk.deb && \
+ rm -rfv /tmp/addons
diff --git a/linux/advanced/vscode-server/android/Makefile b/linux/advanced/vscode-server/android/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/advanced/vscode-server/android/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+ make build
+ make deploy
+ make clean
+
+build:
+ docker-compose build --compress --parallel
+
+deploy:
+ docker-compose push
+
+clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
diff --git a/linux/advanced/vscode-server/android/docker-compose.yml b/linux/advanced/vscode-server/android/docker-compose.yml
new file mode 100644
index 000000000..588cc9db6
--- /dev/null
+++ b/linux/advanced/vscode-server/android/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+ app:
+ image: "epicmorg/vscode-server:android"
+ build:
+ context: .
diff --git a/linux/advanced/vscode-server/cpp/Dockerfile b/linux/advanced/vscode-server/cpp/Dockerfile
new file mode 100644
index 000000000..caeddabad
--- /dev/null
+++ b/linux/advanced/vscode-server/cpp/Dockerfile
@@ -0,0 +1,125 @@
+################################################################################
+# https://github.com/linuxserver/docker-code-server/pkgs/container/code-server
+################################################################################
+FROM epicmorg/vscode-server:latest
+
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+# ARGuments
+##################################################################
+ENV BuildDocker true
+ARG NINJA_ARCH=linux
+ARG NINJA_VERSION=latest
+ARG NINJA_RELEASE_URL=https://api.github.com/repos/ninja-build/ninja/releases/${NINJA_VERSION}
+
+##################################################################
+# deps
+##################################################################
+RUN apt-get update && \
+ apt install -y --allow-unauthenticated --allow-downgrades \
+ build-essential \
+ autoconf-archive \
+ gnu-standards \
+ cmake \
+ libunwind-dev \
+ golang \
+ at \
+ autopkgtest \
+ gcc-multilib \
+ g++-multilib \
+ libxkbcommon-dev \
+ zlib1g-dev \
+ libfreetype6-dev \
+ libegl1-mesa-dev \
+ libgles2-mesa-dev \
+ libgbm-dev \
+ uuid-dev \
+ nvidia-cg-toolkit \
+ nvidia-cg-dev \
+ libavcodec-dev \
+ libsdl2-dev \
+ libsdl-image1.2-dev \
+ libxml2-dev \
+ yasm \
+ devscripts \
+ automake \
+ libtool \
+ autotools-dev \
+ dpkg-dev \
+ fakeroot \
+ checkinstall \
+ dh-make \
+ zlib1g \
+ zlib1g-dev \
+ libssl-dev \
+ libxslt-dev \
+ libgd-dev \
+ libpcre3-dev \
+ libgeoip-dev \
+ libkrb5-dev \
+ libperl-dev \
+ krb5-user \
+ luajit \
+ liblua5.1-0-dev \
+ libmaxminddb-dev \
+ libpam0g-dev \
+ libldap2-dev \
+ libavformat-dev \
+ libavfilter-dev \
+ libswscale-dev \
+ libavcodec-dev \
+ libz-dev \
+ libhiredis-dev \
+ libzip-dev \
+ libcrypto++-dev \
+ libbz2-dev \
+ libvpx-dev \
+ libvpx6 \
+ libc6 \
+ libgssapi-krb5-2 \
+ liblttng-ust0 \
+ libssl1.1 \
+ libstdc++6 \
+ zlib1g \
+ tcl
+
+##################################################################
+# Get NINJA binary
+##################################################################
+RUN curl -s ${NINJA_RELEASE_URL} | jq -r ".assets[] | select(.name | test(\"${NINJA_ARCH}\")) | .browser_download_url" > /tmp/ninja-url.txt && \
+ cat /tmp/ninja-url.txt && \
+ cd /tmp && \
+ wget -q -c --input-file=/tmp/ninja-url.txt && \
+ unzip -o /tmp/ninja-linux.zip -d /bin && \
+ printf "\n--------------------------------\nninja version: $(ninja --version)\n--------------------------------\n\n"
+
+##################################################################
+# steam runtime and ssdk
+##################################################################
+RUN cd / && \
+ sudo mkdir valve && \
+ cd valve && \
+ sudo wget http://media.steampowered.com/client/runtime/steam-runtime-sdk_latest.tar.xz && \
+ sudo tar xvf steam-runtime-sdk_latest.tar.xz && \
+ sudo mv steam-runtime-sdk_2013-09-05 steam-runtime && \
+ sudo chown root:root * -R && \
+ cd steam-runtime && \
+ printf '%s\n' 3 1 Y Y Y | ./setup.sh
+
+##################################################################
+# cleaninig up
+##################################################################
+RUN apt purge policykit-1 -y && \
+ apt clean -y && \
+ apt autoclean -y && \
+ rm -rfv /var/lib/apt/lists/* && \
+ rm -rfv /tmp/mc.patch && \
+ rm -rfv /var/cache/apt/archives/*.deb && \
+ rm -rfv /tmp/7z && \
+ rm -rfv /tmp/deb/* && \
+ rm -rfv /tmp/composer-setup.php && \
+ rm -rfv /tmp/amxx_base_latest.tar.gz && \
+ rm -rfv /tmp/atlassian-plugin-sdk.deb && \
+ rm -rfv /tmp/addons
diff --git a/linux/advanced/vscode-server/cpp/Makefile b/linux/advanced/vscode-server/cpp/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/advanced/vscode-server/cpp/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+ make build
+ make deploy
+ make clean
+
+build:
+ docker-compose build --compress --parallel
+
+deploy:
+ docker-compose push
+
+clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
diff --git a/linux/advanced/vscode-server/cpp/docker-compose.yml b/linux/advanced/vscode-server/cpp/docker-compose.yml
new file mode 100644
index 000000000..24151f879
--- /dev/null
+++ b/linux/advanced/vscode-server/cpp/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+ app:
+ image: "epicmorg/vscode-server:cpp"
+ build:
+ context: .
diff --git a/linux/advanced/vscode-server/devops/Dockerfile b/linux/advanced/vscode-server/devops/Dockerfile
new file mode 100644
index 000000000..752465649
--- /dev/null
+++ b/linux/advanced/vscode-server/devops/Dockerfile
@@ -0,0 +1,295 @@
+################################################################################
+# https://github.com/linuxserver/docker-code-server/pkgs/container/code-server
+################################################################################
+FROM epicmorg/vscode-server:latest
+
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+# ARGuments
+##################################################################
+ENV BuildDocker true
+ARG NINJA_ARCH=linux
+ARG NINJA_VERSION=latest
+ARG NINJA_RELEASE_URL=https://api.github.com/repos/ninja-build/ninja/releases/${NINJA_VERSION}
+
+##################################################################
+# deps
+##################################################################
+RUN apt-get update && \
+ apt install -y --allow-unauthenticated --allow-downgrades \
+ build-essential \
+ autoconf-archive \
+ gnu-standards \
+ cmake \
+ libunwind-dev \
+ golang \
+ at \
+ autopkgtest \
+ gcc-multilib \
+ g++-multilib \
+ libxkbcommon-dev \
+ zlib1g-dev \
+ libfreetype6-dev \
+ libegl1-mesa-dev \
+ libgles2-mesa-dev \
+ libgbm-dev \
+ uuid-dev \
+ nvidia-cg-toolkit \
+ nvidia-cg-dev \
+ libavcodec-dev \
+ libsdl2-dev \
+ libsdl-image1.2-dev \
+ libxml2-dev \
+ yasm \
+ devscripts \
+ automake \
+ libtool \
+ autotools-dev \
+ dpkg-dev \
+ fakeroot \
+ checkinstall \
+ dh-make \
+ zlib1g \
+ zlib1g-dev \
+ libssl-dev \
+ libxslt-dev \
+ libgd-dev \
+ libpcre3-dev \
+ libgeoip-dev \
+ libkrb5-dev \
+ libperl-dev \
+ krb5-user \
+ luajit \
+ liblua5.1-0-dev \
+ libmaxminddb-dev \
+ libpam0g-dev \
+ libldap2-dev \
+ libavformat-dev \
+ libavfilter-dev \
+ libswscale-dev \
+ libavcodec-dev \
+ libz-dev \
+ libhiredis-dev \
+ libzip-dev \
+ libcrypto++-dev \
+ libbz2-dev \
+ libvpx-dev \
+ libvpx6 \
+ libc6 \
+ libgssapi-krb5-2 \
+ liblttng-ust0 \
+ libssl1.1 \
+ libstdc++6 \
+ zlib1g \
+ tcl
+
+##################################################################
+# Get NINJA binary
+##################################################################
+RUN curl -s ${NINJA_RELEASE_URL} | jq -r ".assets[] | select(.name | test(\"${NINJA_ARCH}\")) | .browser_download_url" > /tmp/ninja-url.txt && \
+ cat /tmp/ninja-url.txt && \
+ cd /tmp && \
+ wget -q -c --input-file=/tmp/ninja-url.txt && \
+ unzip -o /tmp/ninja-linux.zip -d /bin && \
+ printf "\n--------------------------------\nninja version: $(ninja --version)\n--------------------------------\n\n"
+
+##################################################################
+# steam runtime and ssdk
+##################################################################
+RUN cd / && \
+ sudo mkdir valve && \
+ cd valve && \
+ sudo wget http://media.steampowered.com/client/runtime/steam-runtime-sdk_latest.tar.xz && \
+ sudo tar xvf steam-runtime-sdk_latest.tar.xz && \
+ sudo mv steam-runtime-sdk_2013-09-05 steam-runtime && \
+ sudo chown root:root * -R && \
+ cd steam-runtime && \
+ printf '%s\n' 3 1 Y Y Y | ./setup.sh
+
+##################################################################
+# docker setup
+##################################################################
+
+#Install packages
+RUN curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - && \
+ echo 'deb https://download.docker.com/linux/ubuntu focal test' > /etc/apt/sources.list.d/docker.list && \
+ apt-cache policy docker-ce && \
+ apt-get update && \
+ apt-get install -y --no-install-recommends --allow-unauthenticated \
+ docker-ce \
+ docker-ce-cli \
+ containerd.io systemd && \
+ systemctl disable docker
+
+# A better fix for TW-52939 Dockerfile build fails because of aufs
+VOLUME /var/lib/docker
+
+COPY run-docker.sh /services/run-docker.sh
+RUN chmod +x /services/run-docker.sh && \
+ sync
+
+##################################################################
+# docker compose setup
+##################################################################
+COPY docker-compose-update /usr/local/bin/docker-compose-update
+RUN chmod +x /usr/local/bin/docker-compose-update && \
+ sync
+
+#Try to test
+RUN docker-compose-update
+
+#Install packages
+RUN export DOCKER_COMPOSE_VERSION=`curl --silent https://api.github.com/repos/docker/compose/releases/latest | jq .name -r` && \
+ echo "Latest compose is: ${DOCKER_COMPOSE_VERSION}" && \
+ curl -SL https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-Linux-x86_64 -o /usr/local/bin/docker-compose && \
+ chmod +x /usr/local/bin/docker-compose && \
+ docker-compose -v
+
+##################################################################
+# dotnet+powershell setup
+##################################################################
+# Opt out of the telemetry feature
+ENV DOTNET_CLI_TELEMETRY_OPTOUT=true
+# Disable first time experience
+ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
+# Configure Kestrel web server to bind to port 80 when present
+ENV ASPNETCORE_URLS=\
+# Enable detection of running in a container
+ENV DOTNET_RUNNING_IN_CONTAINER=true
+# Enable correct mode for dotnet watch (only mode supported in a container)
+ENV DOTNET_USE_POLLING_FILE_WATCHER=true
+# Skip extraction of XML docs - generally not useful within an image/container - helps perfomance
+ENV NUGET_XMLDOC_MODE=skip
+# unofficial support of openssl1.1 instead of 1.0 [https://stackoverflow.com/questions/51901359]
+ENV CLR_OPENSSL_VERSION_OVERRIDE=45
+# PowerShell telemetry for docker image usage
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-20.04
+
+#Install packages
+RUN curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add - && \
+ echo 'deb [arch=amd64,arm64,armhf] https://packages.microsoft.com/ubuntu/20.04/prod focal main' > /etc/apt/sources.list.d/microsoft.dotnet.list && \
+ apt-get update && \
+ apt-get install -y --no-install-recommends --allow-unauthenticated \
+ dotnet-sdk-2.1 \
+ dotnet-runtime-deps-2.1 \
+ dotnet-runtime-2.1 \
+ dotnet-hostfxr-2.1 \
+ dotnet-sdk-3.1 \
+ dotnet-targeting-pack-3.1 \
+ dotnet-runtime-deps-3.1 \
+ dotnet-runtime-3.1 \
+ dotnet-hostfxr-3.1 \
+ dotnet-apphost-pack-3.1 \
+ dotnet-sdk-5.0 \
+ dotnet-targeting-pack-5.0 \
+ dotnet-runtime-deps-5.0 \
+ dotnet-runtime-5.0 \
+ dotnet-hostfxr-5.0 \
+ dotnet-apphost-pack-5.0 \
+ dotnet-sdk-6.0 \
+ dotnet-targeting-pack-6.0 \
+ dotnet-runtime-deps-6.0 \
+ dotnet-runtime-6.0 \
+ dotnet-hostfxr-6.0 \
+ dotnet-apphost-pack-6.0 \
+ dotnet-host \
+ procdump \
+ procmon \
+ powershell-preview \
+ powershell
+
+# Trigger .NET CLI first run experience by running arbitrary cmd to populate local package cache
+RUN dotnet help && \
+ pwsh-preview -v && \
+ pwsh -v
+
+##################################################################
+# AMXXModX setup
+##################################################################
+#
+# Reserved for future
+# export AMXX_CSTRIKE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-cstrike-linux` && \
+# export AMXX_DOD_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-dod-linux` && \
+# export AMXX_ESF_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-esf-linux` && \
+# export AMXX_NS_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-ns-linux` && \
+# export AMXX_TFC_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-tfc-linux` && \
+# export AMXX_TS_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-base-linux` && \
+#
+# Install packages
+ENV AMXX_VERSION=1.9
+ENV AMXX_INSTALL_PATH=/opt/amxmodx/$AMXX_VERSION
+ENV AMXX_BIN_PATH=$AMXX_INSTALL_PATH/scripting
+ENV PATH=$PATH:$AMXX_BIN_PATH
+ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$AMXX_BIN_PATH
+
+RUN export AMXX_BASE_LATEST_VERSION=`curl -s https://www.amxmodx.org/amxxdrop/1.9/amxmodx-latest-base-linux` && \
+ mkdir -p $AMXX_INSTALL_PATH && \
+ curl -SL https://www.amxmodx.org/amxxdrop/{$AMXX_VERSION}/{$AMXX_BASE_LATEST_VERSION} -o /tmp/amxx_base_latest.tar.gz && \
+ cd /tmp && tar -zxf /tmp/amxx_base_latest.tar.gz && cd / && \
+ mv -f /tmp/addons/amxmodx/* $AMXX_INSTALL_PATH && \
+ chmod +x $AMXX_BIN_PATH/amxxpc && \
+ chmod +x $AMXX_BIN_PATH/compile.sh
+
+##################################################################
+# Android SDK
+##################################################################
+ENV ANDROID_HOME=/usr/lib/android-sdk
+ENV ANDROID_SDK_ROOT=/usr/lib/android-sdk
+
+RUN apt update && \
+ apt install -y --allow-unauthenticated \
+ android-sdk \
+ android-sdk-build-tools \
+ android-sdk-platform-tools-common \
+ android-sdk-platform-tools \
+ adb fastboot f2fs-tools e2fsprogs libsqlite3-0 sqlite3
+
+# Activate android sdk
+RUN echo "24333f8a63b6825ea9c5514f83c2829b004d1fee" > /usr/lib/android-sdk/licenses/android-sdk-license
+
+##################################################################
+# SDKMAN
+##################################################################
+#USER root
+#RUN export SDKMAN_DIR="/usr/local/sdkman" && curl -s "https://get.sdkman.io?rcupdate=false" | bash
+RUN export SDKMAN_DIR="/config/.sdkman" && curl -s "https://get.sdkman.io" | bash
+
+##################################################################
+# Gradle
+##################################################################
+RUN /bin/bash -c "source /config/.sdkman/bin/sdkman-init.sh; sdk install gradle;"
+
+##################################################################
+# Kotlin
+##################################################################
+RUN /bin/bash -c "source /config/.sdkman/bin/sdkman-init.sh; sdk install kotlin;"
+
+##################################################################
+# installing java11
+##################################################################
+RUN wget -qO - https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public | apt-key add - && \
+ echo 'deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ focal main' > /etc/apt/sources.list.d/adoptopenjdk-official.list && \
+ apt-get update && \
+ apt-get autoremove -y && \
+ apt-get install -y --allow-unauthenticated adoptopenjdk-11-hotspot && \
+ mkdir /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre && \
+ ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/bin/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/bin && \
+ ln -s /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/lib/ /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/jre/lib
+
+##################################################################
+# cleaninig up
+##################################################################
+RUN apt purge policykit-1 -y && \
+ apt clean -y && \
+ apt autoclean -y && \
+ rm -rfv /var/lib/apt/lists/* && \
+ rm -rfv /tmp/mc.patch && \
+ rm -rfv /var/cache/apt/archives/*.deb && \
+ rm -rfv /tmp/7z && \
+ rm -rfv /tmp/deb/* && \
+ rm -rfv /tmp/composer-setup.php && \
+ rm -rfv /tmp/amxx_base_latest.tar.gz && \
+ rm -rfv /tmp/atlassian-plugin-sdk.deb && \
+ rm -rfv /tmp/addons
diff --git a/linux/advanced/vscode-server/devops/Makefile b/linux/advanced/vscode-server/devops/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/advanced/vscode-server/devops/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+ make build
+ make deploy
+ make clean
+
+build:
+ docker-compose build --compress --parallel
+
+deploy:
+ docker-compose push
+
+clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
diff --git a/linux/advanced/vscode-server/devops/docker-compose-update b/linux/advanced/vscode-server/devops/docker-compose-update
new file mode 100755
index 000000000..1a43d1c9b
--- /dev/null
+++ b/linux/advanced/vscode-server/devops/docker-compose-update
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+export DOCKER_COMPOSE_REMOTE_VERSION=`curl --silent https://api.github.com/repos/docker/compose/releases/latest | jq .name -r`
+
+export DOCKER_COMPOSE_LOCAL_VERSION=`docker-compose -v`
+
+export DOCKER_COMPOSE_BIN=/usr/local/bin/docker-compose
+
+if [ -f $DOCKER_COMPOSE_BIN ]; then
+ echo "========================================================================================"
+ echo "The file '$DOCKER_COMPOSE_BIN' exists."
+ echo "========================================================================================"
+ echo "Local Docker Compose version is: ${DOCKER_COMPOSE_LOCAL_VERSION}"
+ echo "========================================================================================"
+else
+ echo "========================================================================================"
+ echo "The file '$DOCKER_COMPOSE_BIN' in not found. Installing..."
+ echo "========================================================================================"
+fi
+
+echo "========================================================================================"
+echo "Latest Docker Compose version is: ${DOCKER_COMPOSE_REMOTE_VERSION}"
+echo "========================================================================================"
+
+
+echo "========================================================================================"
+echo "Installing remote version:"
+echo "========================================================================================"
+curl -SL https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_REMOTE_VERSION}/docker-compose-Linux-x86_64 -o $DOCKER_COMPOSE_BIN
+
+echo "========================================================================================"
+echo "Setting up permissions..."
+echo "========================================================================================"
+chmod +x $DOCKER_COMPOSE_BIN
+
+
+echo "========================================================================================"
+echo "Updated Docker Compose version is: ${DOCKER_COMPOSE_LOCAL_VERSION}"
+echo "========================================================================================"
diff --git a/linux/advanced/vscode-server/devops/docker-compose.yml b/linux/advanced/vscode-server/devops/docker-compose.yml
new file mode 100644
index 000000000..9e84a7ad1
--- /dev/null
+++ b/linux/advanced/vscode-server/devops/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+ app:
+ image: "epicmorg/vscode-server:devops"
+ build:
+ context: .
diff --git a/linux/teamcity/agent/run-docker.sh b/linux/advanced/vscode-server/devops/run-docker.sh
similarity index 100%
rename from linux/teamcity/agent/run-docker.sh
rename to linux/advanced/vscode-server/devops/run-docker.sh
diff --git a/linux/advanced/vscode-server/docker/Dockerfile b/linux/advanced/vscode-server/docker/Dockerfile
new file mode 100644
index 000000000..cdc3eb807
--- /dev/null
+++ b/linux/advanced/vscode-server/docker/Dockerfile
@@ -0,0 +1,68 @@
+################################################################################
+# https://github.com/linuxserver/docker-code-server/pkgs/container/code-server
+################################################################################
+FROM epicmorg/vscode-server:latest
+
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+# ARGuments
+##################################################################
+ENV BuildDocker true
+
+
+##################################################################
+# docker setup
+##################################################################
+
+#Install packages
+RUN curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - && \
+ echo 'deb https://download.docker.com/linux/ubuntu focal test' > /etc/apt/sources.list.d/docker.list && \
+ apt-cache policy docker-ce && \
+ apt-get update && \
+ apt-get install -y --no-install-recommends --allow-unauthenticated \
+ docker-ce \
+ docker-ce-cli \
+ containerd.io systemd && \
+ systemctl disable docker
+
+# A better fix for TW-52939 Dockerfile build fails because of aufs
+VOLUME /var/lib/docker
+
+COPY run-docker.sh /services/run-docker.sh
+RUN chmod +x /services/run-docker.sh && \
+ sync
+
+##################################################################
+# docker compose setup
+##################################################################
+COPY docker-compose-update /usr/local/bin/docker-compose-update
+RUN chmod +x /usr/local/bin/docker-compose-update && \
+ sync
+
+#Try to test
+RUN docker-compose-update
+
+#Install packages
+RUN export DOCKER_COMPOSE_VERSION=`curl --silent https://api.github.com/repos/docker/compose/releases/latest | jq .name -r` && \
+ echo "Latest compose is: ${DOCKER_COMPOSE_VERSION}" && \
+ curl -SL https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-Linux-x86_64 -o /usr/local/bin/docker-compose && \
+ chmod +x /usr/local/bin/docker-compose && \
+ docker-compose -v
+
+##################################################################
+# cleaninig up
+##################################################################
+RUN apt purge policykit-1 -y && \
+ apt clean -y && \
+ apt autoclean -y && \
+ rm -rfv /var/lib/apt/lists/* && \
+ rm -rfv /tmp/mc.patch && \
+ rm -rfv /var/cache/apt/archives/*.deb && \
+ rm -rfv /tmp/7z && \
+ rm -rfv /tmp/deb/* && \
+ rm -rfv /tmp/composer-setup.php && \
+ rm -rfv /tmp/amxx_base_latest.tar.gz && \
+ rm -rfv /tmp/atlassian-plugin-sdk.deb && \
+ rm -rfv /tmp/addons
diff --git a/linux/advanced/vscode-server/docker/Makefile b/linux/advanced/vscode-server/docker/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/advanced/vscode-server/docker/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+ make build
+ make deploy
+ make clean
+
+build:
+ docker-compose build --compress --parallel
+
+deploy:
+ docker-compose push
+
+clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
diff --git a/linux/advanced/vscode-server/docker/docker-compose-update b/linux/advanced/vscode-server/docker/docker-compose-update
new file mode 100755
index 000000000..1a43d1c9b
--- /dev/null
+++ b/linux/advanced/vscode-server/docker/docker-compose-update
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+export DOCKER_COMPOSE_REMOTE_VERSION=`curl --silent https://api.github.com/repos/docker/compose/releases/latest | jq .name -r`
+
+export DOCKER_COMPOSE_LOCAL_VERSION=`docker-compose -v`
+
+export DOCKER_COMPOSE_BIN=/usr/local/bin/docker-compose
+
+if [ -f $DOCKER_COMPOSE_BIN ]; then
+ echo "========================================================================================"
+ echo "The file '$DOCKER_COMPOSE_BIN' exists."
+ echo "========================================================================================"
+ echo "Local Docker Compose version is: ${DOCKER_COMPOSE_LOCAL_VERSION}"
+ echo "========================================================================================"
+else
+ echo "========================================================================================"
+ echo "The file '$DOCKER_COMPOSE_BIN' in not found. Installing..."
+ echo "========================================================================================"
+fi
+
+echo "========================================================================================"
+echo "Latest Docker Compose version is: ${DOCKER_COMPOSE_REMOTE_VERSION}"
+echo "========================================================================================"
+
+
+echo "========================================================================================"
+echo "Installing remote version:"
+echo "========================================================================================"
+curl -SL https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_REMOTE_VERSION}/docker-compose-Linux-x86_64 -o $DOCKER_COMPOSE_BIN
+
+echo "========================================================================================"
+echo "Setting up permissions..."
+echo "========================================================================================"
+chmod +x $DOCKER_COMPOSE_BIN
+
+
+echo "========================================================================================"
+echo "Updated Docker Compose version is: ${DOCKER_COMPOSE_LOCAL_VERSION}"
+echo "========================================================================================"
diff --git a/linux/advanced/vscode-server/docker/docker-compose.yml b/linux/advanced/vscode-server/docker/docker-compose.yml
new file mode 100644
index 000000000..6657a9679
--- /dev/null
+++ b/linux/advanced/vscode-server/docker/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+ app:
+ image: "epicmorg/vscode-server:docker"
+ build:
+ context: .
diff --git a/linux/advanced/vscode-server/docker/run-docker.sh b/linux/advanced/vscode-server/docker/run-docker.sh
new file mode 100755
index 000000000..41b5e68e5
--- /dev/null
+++ b/linux/advanced/vscode-server/docker/run-docker.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+if [ "$DOCKER_IN_DOCKER" = "start" ] ; then
+ rm /var/run/docker.pid 2>/dev/null
+ service docker start
+ echo "Docker daemon started"
+fi
diff --git a/linux/advanced/vscode-server/dotnet/Dockerfile b/linux/advanced/vscode-server/dotnet/Dockerfile
new file mode 100644
index 000000000..51639c1ec
--- /dev/null
+++ b/linux/advanced/vscode-server/dotnet/Dockerfile
@@ -0,0 +1,86 @@
+################################################################################
+# https://github.com/linuxserver/docker-code-server/pkgs/container/code-server
+################################################################################
+FROM epicmorg/vscode-server:latest
+
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+##################################################################
+# ARGuments
+##################################################################
+ENV BuildDocker true
+
+##################################################################
+# dotnet+powershell setup
+##################################################################
+# Opt out of the telemetry feature
+ENV DOTNET_CLI_TELEMETRY_OPTOUT=true
+# Disable first time experience
+ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=true
+# Configure Kestrel web server to bind to port 80 when present
+ENV ASPNETCORE_URLS=\
+# Enable detection of running in a container
+ENV DOTNET_RUNNING_IN_CONTAINER=true
+# Enable correct mode for dotnet watch (only mode supported in a container)
+ENV DOTNET_USE_POLLING_FILE_WATCHER=true
+# Skip extraction of XML docs - generally not useful within an image/container - helps perfomance
+ENV NUGET_XMLDOC_MODE=skip
+# unofficial support of openssl1.1 instead of 1.0 [https://stackoverflow.com/questions/51901359]
+ENV CLR_OPENSSL_VERSION_OVERRIDE=45
+# PowerShell telemetry for docker image usage
+ENV POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-DotnetSDK-Ubuntu-20.04
+
+#Install packages
+RUN curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add - && \
+ echo 'deb [arch=amd64,arm64,armhf] https://packages.microsoft.com/ubuntu/20.04/prod focal main' > /etc/apt/sources.list.d/microsoft.dotnet.list && \
+ apt-get update && \
+ apt-get install -y --no-install-recommends --allow-unauthenticated \
+ dotnet-sdk-2.1 \
+ dotnet-runtime-deps-2.1 \
+ dotnet-runtime-2.1 \
+ dotnet-hostfxr-2.1 \
+ dotnet-sdk-3.1 \
+ dotnet-targeting-pack-3.1 \
+ dotnet-runtime-deps-3.1 \
+ dotnet-runtime-3.1 \
+ dotnet-hostfxr-3.1 \
+ dotnet-apphost-pack-3.1 \
+ dotnet-sdk-5.0 \
+ dotnet-targeting-pack-5.0 \
+ dotnet-runtime-deps-5.0 \
+ dotnet-runtime-5.0 \
+ dotnet-hostfxr-5.0 \
+ dotnet-apphost-pack-5.0 \
+ dotnet-sdk-6.0 \
+ dotnet-targeting-pack-6.0 \
+ dotnet-runtime-deps-6.0 \
+ dotnet-runtime-6.0 \
+ dotnet-hostfxr-6.0 \
+ dotnet-apphost-pack-6.0 \
+ dotnet-host \
+ procdump \
+ procmon \
+ powershell-preview \
+ powershell
+
+# Trigger .NET CLI first run experience by running arbitrary cmd to populate local package cache
+RUN dotnet help && \
+ pwsh-preview -v && \
+ pwsh -v
+
+##################################################################
+# cleaninig up
+##################################################################
+RUN apt purge policykit-1 -y && \
+ apt clean -y && \
+ apt autoclean -y && \
+ rm -rfv /var/lib/apt/lists/* && \
+ rm -rfv /tmp/mc.patch && \
+ rm -rfv /var/cache/apt/archives/*.deb && \
+ rm -rfv /tmp/7z && \
+ rm -rfv /tmp/deb/* && \
+ rm -rfv /tmp/composer-setup.php && \
+ rm -rfv /tmp/amxx_base_latest.tar.gz && \
+ rm -rfv /tmp/atlassian-plugin-sdk.deb && \
+ rm -rfv /tmp/addons
diff --git a/linux/advanced/vscode-server/dotnet/Makefile b/linux/advanced/vscode-server/dotnet/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/advanced/vscode-server/dotnet/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+ make build
+ make deploy
+ make clean
+
+build:
+ docker-compose build --compress --parallel
+
+deploy:
+ docker-compose push
+
+clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
diff --git a/linux/advanced/vscode-server/dotnet/docker-compose.yml b/linux/advanced/vscode-server/dotnet/docker-compose.yml
new file mode 100644
index 000000000..fec266aff
--- /dev/null
+++ b/linux/advanced/vscode-server/dotnet/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+ app:
+ image: "epicmorg/vscode-server:dotnet"
+ build:
+ context: .
diff --git a/linux/advanced/vscode-server/latest/Dockerfile b/linux/advanced/vscode-server/latest/Dockerfile
new file mode 100644
index 000000000..3da0479cd
--- /dev/null
+++ b/linux/advanced/vscode-server/latest/Dockerfile
@@ -0,0 +1,131 @@
+################################################################################
+# https://github.com/linuxserver/docker-code-server/pkgs/container/code-server
+################################################################################
+FROM ghcr.io/linuxserver/code-server:focal
+
+LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
+ARG DEBIAN_FRONTEND=noninteractive
+
+USER root
+
+##################################################################
+# ARGuments
+##################################################################
+ENV BuildDocker true
+
+##################################################################
+# 7z official binary
+##################################################################
+ENV SZ_VERSION=7z2103
+ENV SZ_DOWNLOAD_URL=https://www.7-zip.org/a/${SZ_VERSION}-linux-x64.tar.xz
+
+##################################################################
+# installing utils
+##################################################################
+# libzip4 \
+# lbzip2 \
+RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \
+ apt-get update && \
+ apt-get install -y --allow-unauthenticated \
+ apt-transport-https \
+ apt-utils \
+ aptitude \
+ bash \
+ binutils \
+ bzip2 \
+ ca-certificates \
+ cmatrix \
+ cmatrix-xfont \
+ console-cyrillic \
+ cron \
+ curl \
+ clzip \
+ dos2unix \
+ ffmpeg \
+ fontconfig \
+ git \
+ gnupg \
+ gnupg2 \
+ graphicsmagick \
+ gzip \
+ htop \
+ iftop \
+ iputils-ping \
+ jq \
+ kmod \
+ libxml2-dev \
+ libxml2-utils \
+ libsvn-java \
+ locales \
+ lsb-release \
+ lsof \
+ lynx \
+ lzma \
+ lzip \
+ lzop \
+ mc \
+ mercurial \
+ nano \
+ nload \
+ nmap \
+ openssl \
+ perl \
+ procps \
+ pbzip2 \
+ plzip \
+ p7zip-full \
+ p7zip-rar \
+ rsync \
+ rar \
+ screenfetch \
+ smbclient \
+ software-properties-common \
+ subversion \
+ sudo \
+ telnet \
+ tini \
+ tmux \
+ tree \
+ util-linux \
+ uuid-runtime \
+ unrar \
+ xz-utils \
+ wget \
+ zip
+
+##################################################################
+# Install 7z official binary
+##################################################################
+RUN wget -nv --random-wait -c -O /tmp/7z.tar.xz ${SZ_DOWNLOAD_URL} && \
+ mkdir -p /tmp/7z && \
+ tar -xf /tmp/7z.tar.xz -C /tmp/7z && \
+ chmod +x /tmp/7z/7zz && \
+ mv -fv /tmp/7z/7zz /usr/bin/ && \
+ 7zz | head -4 && \
+ 7z | head -4
+
+
+##################################################################
+# Install GitHub CLI binary
+##################################################################
+RUN curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg && \
+ echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null && \
+ sudo apt update && \
+ sudo apt install -y --allow-unauthenticated gh && \
+ gh --version
+
+##################################################################
+# cleaninig up
+##################################################################
+RUN apt purge policykit-1 -y && \
+ apt clean -y && \
+ apt autoclean -y && \
+ rm -rfv /var/lib/apt/lists/* && \
+ rm -rfv /tmp/mc.patch && \
+ rm -rfv /var/cache/apt/archives/*.deb && \
+ rm -rfv /tmp/7z && \
+ rm -rfv /tmp/deb/* && \
+ rm -rfv /tmp/composer-setup.php && \
+ rm -rfv /tmp/amxx_base_latest.tar.gz && \
+ rm -rfv /tmp/atlassian-plugin-sdk.deb && \
+ rm -rfv /tmp/addons
diff --git a/linux/advanced/vscode-server/latest/Makefile b/linux/advanced/vscode-server/latest/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/advanced/vscode-server/latest/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+ make build
+ make deploy
+ make clean
+
+build:
+ docker-compose build --compress --parallel
+
+deploy:
+ docker-compose push
+
+clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
diff --git a/linux/advanced/vscode-server/latest/docker-compose.yml b/linux/advanced/vscode-server/latest/docker-compose.yml
new file mode 100644
index 000000000..6b70d72da
--- /dev/null
+++ b/linux/advanced/vscode-server/latest/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+ app:
+ image: "epicmorg/vscode-server:latest"
+ build:
+ context: .
diff --git a/linux/zabbix/agent/Dockerfile b/linux/advanced/zabbix/agent/Dockerfile
similarity index 100%
rename from linux/zabbix/agent/Dockerfile
rename to linux/advanced/zabbix/agent/Dockerfile
diff --git a/linux/advanced/zabbix/agent/Makefile b/linux/advanced/zabbix/agent/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/advanced/zabbix/agent/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+ make build
+ make deploy
+ make clean
+
+build:
+ docker-compose build --compress --parallel
+
+deploy:
+ docker-compose push
+
+clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
diff --git a/linux/zabbix/agent/README.md b/linux/advanced/zabbix/agent/README.md
similarity index 100%
rename from linux/zabbix/agent/README.md
rename to linux/advanced/zabbix/agent/README.md
diff --git a/linux/advanced/zabbix/agent/docker-compose.yml b/linux/advanced/zabbix/agent/docker-compose.yml
new file mode 100644
index 000000000..711b522db
--- /dev/null
+++ b/linux/advanced/zabbix/agent/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+ app:
+ image: "epicmorg/zabbix-agent:latest"
+ build:
+ context: .
diff --git a/linux/teamcity/server/locale.gen b/linux/advanced/zabbix/agent/locale.gen
similarity index 100%
rename from linux/teamcity/server/locale.gen
rename to linux/advanced/zabbix/agent/locale.gen
diff --git a/linux/teamcity/server/locale.gen.full b/linux/advanced/zabbix/agent/locale.gen.full
similarity index 100%
rename from linux/teamcity/server/locale.gen.full
rename to linux/advanced/zabbix/agent/locale.gen.full
diff --git a/linux/zabbix/agent/sources.list b/linux/advanced/zabbix/agent/sources.list
similarity index 100%
rename from linux/zabbix/agent/sources.list
rename to linux/advanced/zabbix/agent/sources.list
diff --git a/linux/zabbix/java-gateway/Dockerfile b/linux/advanced/zabbix/java-gateway/Dockerfile
similarity index 100%
rename from linux/zabbix/java-gateway/Dockerfile
rename to linux/advanced/zabbix/java-gateway/Dockerfile
diff --git a/linux/advanced/zabbix/java-gateway/Makefile b/linux/advanced/zabbix/java-gateway/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/advanced/zabbix/java-gateway/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+ make build
+ make deploy
+ make clean
+
+build:
+ docker-compose build --compress --parallel
+
+deploy:
+ docker-compose push
+
+clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
diff --git a/linux/zabbix/java-gateway/README.md b/linux/advanced/zabbix/java-gateway/README.md
similarity index 100%
rename from linux/zabbix/java-gateway/README.md
rename to linux/advanced/zabbix/java-gateway/README.md
diff --git a/linux/advanced/zabbix/java-gateway/docker-compose.yml b/linux/advanced/zabbix/java-gateway/docker-compose.yml
new file mode 100644
index 000000000..7a2a51cd1
--- /dev/null
+++ b/linux/advanced/zabbix/java-gateway/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+ app:
+ image: "epicmorg/zabbix-java-gateway:latest"
+ build:
+ context: .
diff --git a/linux/zabbix/agent/locale.gen b/linux/advanced/zabbix/java-gateway/locale.gen
similarity index 100%
rename from linux/zabbix/agent/locale.gen
rename to linux/advanced/zabbix/java-gateway/locale.gen
diff --git a/linux/zabbix/agent/locale.gen.full b/linux/advanced/zabbix/java-gateway/locale.gen.full
similarity index 100%
rename from linux/zabbix/agent/locale.gen.full
rename to linux/advanced/zabbix/java-gateway/locale.gen.full
diff --git a/linux/zabbix/java-gateway/sources.list b/linux/advanced/zabbix/java-gateway/sources.list
similarity index 100%
rename from linux/zabbix/java-gateway/sources.list
rename to linux/advanced/zabbix/java-gateway/sources.list
diff --git a/linux/zabbix/proxy/Dockerfile b/linux/advanced/zabbix/proxy/Dockerfile
similarity index 100%
rename from linux/zabbix/proxy/Dockerfile
rename to linux/advanced/zabbix/proxy/Dockerfile
diff --git a/linux/advanced/zabbix/proxy/Makefile b/linux/advanced/zabbix/proxy/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/advanced/zabbix/proxy/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+ make build
+ make deploy
+ make clean
+
+build:
+ docker-compose build --compress --parallel
+
+deploy:
+ docker-compose push
+
+clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
diff --git a/linux/zabbix/proxy/README.md b/linux/advanced/zabbix/proxy/README.md
similarity index 100%
rename from linux/zabbix/proxy/README.md
rename to linux/advanced/zabbix/proxy/README.md
diff --git a/linux/advanced/zabbix/proxy/docker-compose.yml b/linux/advanced/zabbix/proxy/docker-compose.yml
new file mode 100644
index 000000000..0f07d0583
--- /dev/null
+++ b/linux/advanced/zabbix/proxy/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+ app:
+ image: "epicmorg/zabbix-proxy-sqlite3:latest"
+ build:
+ context: .
diff --git a/linux/zabbix/java-gateway/locale.gen b/linux/advanced/zabbix/proxy/locale.gen
similarity index 100%
rename from linux/zabbix/java-gateway/locale.gen
rename to linux/advanced/zabbix/proxy/locale.gen
diff --git a/linux/zabbix/java-gateway/locale.gen.full b/linux/advanced/zabbix/proxy/locale.gen.full
similarity index 100%
rename from linux/zabbix/java-gateway/locale.gen.full
rename to linux/advanced/zabbix/proxy/locale.gen.full
diff --git a/linux/zabbix/proxy/sources.list b/linux/advanced/zabbix/proxy/sources.list
similarity index 100%
rename from linux/zabbix/proxy/sources.list
rename to linux/advanced/zabbix/proxy/sources.list
diff --git a/linux/zabbix/server/Dockerfile b/linux/advanced/zabbix/server/Dockerfile
similarity index 100%
rename from linux/zabbix/server/Dockerfile
rename to linux/advanced/zabbix/server/Dockerfile
diff --git a/linux/advanced/zabbix/server/Makefile b/linux/advanced/zabbix/server/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/advanced/zabbix/server/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+ make build
+ make deploy
+ make clean
+
+build:
+ docker-compose build --compress --parallel
+
+deploy:
+ docker-compose push
+
+clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
diff --git a/linux/zabbix/server/README.md b/linux/advanced/zabbix/server/README.md
similarity index 100%
rename from linux/zabbix/server/README.md
rename to linux/advanced/zabbix/server/README.md
diff --git a/linux/advanced/zabbix/server/docker-compose.yml b/linux/advanced/zabbix/server/docker-compose.yml
new file mode 100644
index 000000000..c0e262612
--- /dev/null
+++ b/linux/advanced/zabbix/server/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+ app:
+ image: "epicmorg/zabbix-server-mysql:latest"
+ build:
+ context: .
diff --git a/linux/zabbix/proxy/locale.gen b/linux/advanced/zabbix/server/locale.gen
similarity index 100%
rename from linux/zabbix/proxy/locale.gen
rename to linux/advanced/zabbix/server/locale.gen
diff --git a/linux/zabbix/proxy/locale.gen.full b/linux/advanced/zabbix/server/locale.gen.full
similarity index 100%
rename from linux/zabbix/proxy/locale.gen.full
rename to linux/advanced/zabbix/server/locale.gen.full
diff --git a/linux/zabbix/server/sources.list b/linux/advanced/zabbix/server/sources.list
similarity index 100%
rename from linux/zabbix/server/sources.list
rename to linux/advanced/zabbix/server/sources.list
diff --git a/linux/zabbix/web/Dockerfile b/linux/advanced/zabbix/web/Dockerfile
similarity index 100%
rename from linux/zabbix/web/Dockerfile
rename to linux/advanced/zabbix/web/Dockerfile
diff --git a/linux/advanced/zabbix/web/Makefile b/linux/advanced/zabbix/web/Makefile
new file mode 100644
index 000000000..bad6d73b5
--- /dev/null
+++ b/linux/advanced/zabbix/web/Makefile
@@ -0,0 +1,19 @@
+all: app
+
+app:
+ make build
+ make deploy
+ make clean
+
+build:
+ docker-compose build --compress --parallel
+
+deploy:
+ docker-compose push
+
+clean:
+ docker container prune -f
+ docker image prune -f
+ docker network prune -f
+ docker volume prune -f
+ docker system prune -af
diff --git a/linux/zabbix/web/README.md b/linux/advanced/zabbix/web/README.md
similarity index 100%
rename from linux/zabbix/web/README.md
rename to linux/advanced/zabbix/web/README.md
diff --git a/linux/advanced/zabbix/web/docker-compose.yml b/linux/advanced/zabbix/web/docker-compose.yml
new file mode 100644
index 000000000..d8c673d98
--- /dev/null
+++ b/linux/advanced/zabbix/web/docker-compose.yml
@@ -0,0 +1,6 @@
+version: '3.9'
+services:
+ app:
+ image: "epicmorg/zabbix-web-apache-mysql:latest"
+ build:
+ context: .
diff --git a/linux/zabbix/server/locale.gen b/linux/advanced/zabbix/web/locale.gen
similarity index 100%
rename from linux/zabbix/server/locale.gen
rename to linux/advanced/zabbix/web/locale.gen
diff --git a/linux/zabbix/server/locale.gen.full b/linux/advanced/zabbix/web/locale.gen.full
similarity index 100%
rename from linux/zabbix/server/locale.gen.full
rename to linux/advanced/zabbix/web/locale.gen.full
diff --git a/linux/zabbix/web/sources.list b/linux/advanced/zabbix/web/sources.list
similarity index 100%
rename from linux/zabbix/web/sources.list
rename to linux/advanced/zabbix/web/sources.list
diff --git a/linux/apache2/latest/Dockerfile b/linux/apache2/latest/Dockerfile
deleted file mode 100644
index 70697da92..000000000
--- a/linux/apache2/latest/Dockerfile
+++ /dev/null
@@ -1,98 +0,0 @@
-FROM epicmorg/php:latest
-LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-ARG PHP_MODULE_PATH=/usr/lib/php/20190902
-ARG PHP_VER=7.4
-ARG PHP_DIR=/etc/php/${PHP_VER}
-ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini
-ARG SMB_PHP_INI=${PHP_DIR}/mods-available/smbclient.ini
-
-##################################################################
-# Installing Apache2
-##################################################################
-#installing apache2 repo
-RUN wget -O /etc/apt/trusted.gpg.d/apache2.gpg https://packages.sury.org/apache2/apt.gpg
-RUN sh -c 'echo "deb https://packages.sury.org/apache2/ buster main" > /etc/apt/sources.list.d/apache2.list'
-
-#Install base packages
-RUN apt-get update && \
- apt-get install -y --allow-unauthenticated \
- apache2 \
- apache2-utils \
- libapache2-mod-php7.4 \
- libapache2-mod-webauth \
- libapache2-mod-xforward \
- libapache2-mod-security2 && \
- a2enmod \
- php7.4 \
- rewrite \
- ldap \
- heartmonitor \
- auth_basic \
- authnz_ldap \
- headers \
- heartbeat \
- lua \
- mime \
- status \
- xml2enc \
- xforward \
- remoteip \
- filter \
- dav \
- dav_fs \
- alias && \
- ln -sf /etc/ssl/dhparam.pem /etc/apache2/dhparam.pem && \
- php -m && \
- php -v
-
-##################################################################
-# LDAP Fix
-##################################################################
-RUN echo "TLS_REQCERT never" >> /etc/ldap/ldap.conf
-
-##################################################################
-# Installing IOnCube addon
-##################################################################
-RUN echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PHP_DIR}/apache2/php.ini && \
- php -m && \
- php -v
-
-##################################################################
-# Installing P4 addon
-##################################################################
-RUN ln -sf ${P4_PHP_INI} ${PHP_DIR}/apache2/conf.d/perforce.ini && \
- php -m && \
- php -v
-
-##################################################################
-# Installing smbclient addon
-##################################################################
-RUN ln -sf ${SMB_PHP_INI} ${PHP_DIR}/apache2/conf.d/smbclient.ini && \
- php -m && \
- php -v
-
-##################################################################
-# cleaninig up
-##################################################################
-RUN apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb && \
- rm -rfv /tmp/deb/* && \
- rm -rfv /tmp/ioncube/* && \
- rm -rfv /tmp/composer-setup.php && \
- rm -rfv /tmp/ioncube.tar.gz
-
-#volumes
-VOLUME ["/var/www"]
-
-# Add image configuration and scripts
-COPY run.sh /run.sh
-RUN chmod 755 /*.sh
-
-# Configure application
-EXPOSE 80
-WORKDIR /var/www/
-CMD ["/run.sh"]
diff --git a/linux/apache2/latest/Makefile b/linux/apache2/latest/Makefile
deleted file mode 100644
index 5807f7dc3..000000000
--- a/linux/apache2/latest/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-all: apache2
-apache2:
- docker build --compress -t epicmorg/apache2:latest .
- docker push epicmorg/apache2:latest
-
- docker tag epicmorg/apache2:latest epicmorg/websites:latest
- docker push epicmorg/websites:latest
\ No newline at end of file
diff --git a/linux/apache2/php7.2/Dockerfile b/linux/apache2/php7.2/Dockerfile
deleted file mode 100644
index c59fca7bf..000000000
--- a/linux/apache2/php7.2/Dockerfile
+++ /dev/null
@@ -1,92 +0,0 @@
-FROM epicmorg/php:php7.2
-LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-ARG PHP_MODULE_PATH=/usr/lib/php/20170718
-ARG PHP_VER=7.2
-ARG PHP_DIR=/etc/php/${PHP_VER}
-ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini
-
-##################################################################
-# Installing Apache2
-##################################################################
-#installing apache2 repo
-RUN wget -O /etc/apt/trusted.gpg.d/apache2.gpg https://packages.sury.org/apache2/apt.gpg
-RUN sh -c 'echo "deb https://packages.sury.org/apache2/ buster main" > /etc/apt/sources.list.d/apache2.list'
-
-#Install base packages
-RUN apt-get update && \
- apt-get install -y --allow-unauthenticated \
- apache2 \
- apache2-utils \
- libapache2-mod-php7.2 \
- libapache2-mod-webauth \
- libapache2-mod-xforward \
- libapache2-mod-security2 \
- libmemcached-dev && \
- a2enmod \
- php7.2 \
- rewrite \
- ldap \
- heartmonitor \
- auth_basic \
- authnz_ldap \
- headers \
- heartbeat \
- lua \
- mime \
- status \
- xml2enc \
- xforward \
- remoteip \
- filter \
- dav \
- dav_fs \
- alias && \
- ln -sf /etc/ssl/dhparam.pem /etc/apache2/dhparam.pem && \
- php -m && \
- php -v
-
-##################################################################
-# LDAP Fix
-##################################################################
-RUN echo "TLS_REQCERT never" >> /etc/ldap/ldap.conf
-
-##################################################################
-# Installing IOnCube addon
-##################################################################
-RUN echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.2.so" >> ${PHP_DIR}/apache2/php.ini && \
- php -m && \
- php -v
-
-
-##################################################################
-# Installing P4 addon
-##################################################################
-RUN ln -sf ${P4_PHP_INI} ${PHP_DIR}/apache2/conf.d/perforce.ini && \
- php -m && \
- php -v
-
-##################################################################
-# cleaninig up
-##################################################################
-RUN apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb && \
- rm -rfv /tmp/deb/* && \
- rm -rfv /tmp/ioncube/* && \
- rm -rfv /tmp/composer-setup.php && \
- rm -rfv /tmp/ioncube.tar.gz
-
-#volumes
-VOLUME ["/var/www"]
-
-# Add image configuration and scripts
-COPY run.sh /run.sh
-RUN chmod 755 /*.sh
-
-# Configure application
-EXPOSE 80
-WORKDIR /var/www/
-CMD ["/run.sh"]
diff --git a/linux/apache2/php7.2/Makefile b/linux/apache2/php7.2/Makefile
deleted file mode 100644
index e10f24c18..000000000
--- a/linux/apache2/php7.2/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-all: apache2
-apache2:
- docker build --compress -t epicmorg/apache2:php7.2 .
- docker push epicmorg/apache2:php7.2
-
- docker tag epicmorg/apache2:php7.2 epicmorg/websites:php7.2
- docker push epicmorg/websites:php7.2
\ No newline at end of file
diff --git a/linux/apache2/php7.3/Dockerfile b/linux/apache2/php7.3/Dockerfile
deleted file mode 100644
index e42e0ad7e..000000000
--- a/linux/apache2/php7.3/Dockerfile
+++ /dev/null
@@ -1,91 +0,0 @@
-FROM epicmorg/php:php7.3
-LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-ARG PHP_MODULE_PATH=/usr/lib/php/20180731
-ARG PHP_VER=7.3
-ARG PHP_DIR=/etc/php/${PHP_VER}
-ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini
-
-##################################################################
-# Installing Apache2
-##################################################################
-#installing apache2 repo
-RUN wget -O /etc/apt/trusted.gpg.d/apache2.gpg https://packages.sury.org/apache2/apt.gpg
-RUN sh -c 'echo "deb https://packages.sury.org/apache2/ buster main" > /etc/apt/sources.list.d/apache2.list'
-
-#Install base packages
-RUN apt-get update && \
- apt-get install -y --allow-unauthenticated \
- apache2 \
- apache2-utils \
- libapache2-mod-php7.3 \
- libapache2-mod-webauth \
- libapache2-mod-xforward \
- libapache2-mod-security2 \
- libmemcached-dev && \
- a2enmod \
- php7.3 \
- rewrite \
- ldap \
- heartmonitor \
- auth_basic \
- authnz_ldap \
- headers \
- heartbeat \
- lua \
- mime \
- status \
- xml2enc \
- xforward \
- remoteip \
- filter \
- dav \
- dav_fs \
- alias && \
- ln -sf /etc/ssl/dhparam.pem /etc/apache2/dhparam.pem && \
- php -m && \
- php -v
-
-##################################################################
-# LDAP Fix
-##################################################################
-RUN echo "TLS_REQCERT never" >> /etc/ldap/ldap.conf
-
-##################################################################
-# Installing IOnCube addon
-##################################################################
-RUN echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.3.so" >> ${PHP_DIR}/apache2/php.ini && \
- php -m && \
- php -v
-
-##################################################################
-# Installing Composer addon
-##################################################################
-RUN cd /tmp && \
- php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" && \
- php composer-setup.php --install-dir=/usr/local/bin --filename=composer && \
- rm /tmp/composer-setup.php
-
-##################################################################
-# cleaninig up
-##################################################################
-RUN apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb && \
- rm -rfv /tmp/deb/* && \
- rm -rfv /tmp/composer-setup.php && \
- rm -rfv /tmp/ioncube.tar.gz
-
-#volumes
-VOLUME ["/var/www"]
-
-# Add image configuration and scripts
-COPY run.sh /run.sh
-RUN chmod 755 /*.sh
-
-# Configure application
-EXPOSE 80
-WORKDIR /var/www/
-CMD ["/run.sh"]
diff --git a/linux/apache2/php7.3/Makefile b/linux/apache2/php7.3/Makefile
deleted file mode 100644
index 39f4fc5a9..000000000
--- a/linux/apache2/php7.3/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-all: apache2
-apache2:
- docker build --compress -t epicmorg/apache2:php7.3 .
- docker push epicmorg/apache2:php7.3
-
- docker tag epicmorg/apache2:php7.3 epicmorg/websites:php7.3
- docker push epicmorg/websites:php7.3
-
diff --git a/linux/apache2/php7.4/Dockerfile b/linux/apache2/php7.4/Dockerfile
deleted file mode 100644
index 70697da92..000000000
--- a/linux/apache2/php7.4/Dockerfile
+++ /dev/null
@@ -1,98 +0,0 @@
-FROM epicmorg/php:latest
-LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-ARG PHP_MODULE_PATH=/usr/lib/php/20190902
-ARG PHP_VER=7.4
-ARG PHP_DIR=/etc/php/${PHP_VER}
-ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini
-ARG SMB_PHP_INI=${PHP_DIR}/mods-available/smbclient.ini
-
-##################################################################
-# Installing Apache2
-##################################################################
-#installing apache2 repo
-RUN wget -O /etc/apt/trusted.gpg.d/apache2.gpg https://packages.sury.org/apache2/apt.gpg
-RUN sh -c 'echo "deb https://packages.sury.org/apache2/ buster main" > /etc/apt/sources.list.d/apache2.list'
-
-#Install base packages
-RUN apt-get update && \
- apt-get install -y --allow-unauthenticated \
- apache2 \
- apache2-utils \
- libapache2-mod-php7.4 \
- libapache2-mod-webauth \
- libapache2-mod-xforward \
- libapache2-mod-security2 && \
- a2enmod \
- php7.4 \
- rewrite \
- ldap \
- heartmonitor \
- auth_basic \
- authnz_ldap \
- headers \
- heartbeat \
- lua \
- mime \
- status \
- xml2enc \
- xforward \
- remoteip \
- filter \
- dav \
- dav_fs \
- alias && \
- ln -sf /etc/ssl/dhparam.pem /etc/apache2/dhparam.pem && \
- php -m && \
- php -v
-
-##################################################################
-# LDAP Fix
-##################################################################
-RUN echo "TLS_REQCERT never" >> /etc/ldap/ldap.conf
-
-##################################################################
-# Installing IOnCube addon
-##################################################################
-RUN echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PHP_DIR}/apache2/php.ini && \
- php -m && \
- php -v
-
-##################################################################
-# Installing P4 addon
-##################################################################
-RUN ln -sf ${P4_PHP_INI} ${PHP_DIR}/apache2/conf.d/perforce.ini && \
- php -m && \
- php -v
-
-##################################################################
-# Installing smbclient addon
-##################################################################
-RUN ln -sf ${SMB_PHP_INI} ${PHP_DIR}/apache2/conf.d/smbclient.ini && \
- php -m && \
- php -v
-
-##################################################################
-# cleaninig up
-##################################################################
-RUN apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb && \
- rm -rfv /tmp/deb/* && \
- rm -rfv /tmp/ioncube/* && \
- rm -rfv /tmp/composer-setup.php && \
- rm -rfv /tmp/ioncube.tar.gz
-
-#volumes
-VOLUME ["/var/www"]
-
-# Add image configuration and scripts
-COPY run.sh /run.sh
-RUN chmod 755 /*.sh
-
-# Configure application
-EXPOSE 80
-WORKDIR /var/www/
-CMD ["/run.sh"]
diff --git a/linux/apache2/php7.4/Makefile b/linux/apache2/php7.4/Makefile
deleted file mode 100644
index 810c88cf6..000000000
--- a/linux/apache2/php7.4/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-all: apache2
-apache2:
- docker build --compress -t epicmorg/apache2:php7.4 .
- docker push epicmorg/apache2:php7.4
-
- docker tag epicmorg/apache2:php7.4 epicmorg/websites:php7.4
- docker push epicmorg/websites:php7.4
-
diff --git a/linux/atlassian/bitbucket/latest/Dockerfile b/linux/atlassian/bitbucket/latest/Dockerfile
deleted file mode 100644
index c21658472..000000000
--- a/linux/atlassian/bitbucket/latest/Dockerfile
+++ /dev/null
@@ -1,45 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG BITBUCKET_VERSION=7.11.2
-ARG DOWNLOAD_URL=https://product-downloads.atlassian.com/software/stash/downloads/atlassian-bitbucket-${BITBUCKET_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/display/BitbucketServer/Bitbucket+Server+home+directory
-ENV BITBUCKET_HOME /var/atlassian/application-data/bitbucket
-ENV BITBUCKET_INSTALL_DIR /opt/atlassian/bitbucket
-
-VOLUME ["${BITBUCKET_HOME}"]
-WORKDIR $BITBUCKET_HOME
-
-# Expose HTTP and SSH ports
-EXPOSE 7990
-EXPOSE 7999
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${BITBUCKET_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "${BITBUCKET_INSTALL_DIR}" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${BITBUCKET_INSTALL_DIR}/ \
- && sed -i -e 's/^# umask/umask/' ${BITBUCKET_INSTALL_DIR}/bin/_start-webapp.sh && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/bitbucket/latest/Makefile b/linux/atlassian/bitbucket/latest/Makefile
deleted file mode 100644
index 837bad7bf..000000000
--- a/linux/atlassian/bitbucket/latest/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: bitbucket
-
-bitbucket:
- docker build --compress -t epicmorg/bitbucket .
- docker push epicmorg/bitbucket:latest
\ No newline at end of file
diff --git a/linux/atlassian/confluence/5/5.5/README.md b/linux/atlassian/confluence/5/5.5/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/5/5.5/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/5/5.9.14/README.md b/linux/atlassian/confluence/5/5.9.14/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/5/5.9.14/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/5/README.md b/linux/atlassian/confluence/5/README.md
deleted file mode 100644
index 0b5136ccf..000000000
--- a/linux/atlassian/confluence/5/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# [Atlassian Enterprise releases](https://confluence.atlassian.com/enterprise/atlassian-enterprise-releases-948227420.html)
-## Build info
-
-All presented images avalible on our repo in docker hub.
-
--------
-
-*Some old versions of Confluence may fail health check with [AdoptOpenJDK](https://github.com/AdoptOpenJDK) (open source, prebuilt OpenJDK binaries). But it will be works.*
\ No newline at end of file
diff --git a/linux/atlassian/confluence/6/6.0.1/Dockerfile b/linux/atlassian/confluence/6/6.0.1/Dockerfile
deleted file mode 100644
index 60a125dfc..000000000
--- a/linux/atlassian/confluence/6/6.0.1/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.0.1
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.0.1/Makefile b/linux/atlassian/confluence/6/6.0.1/Makefile
deleted file mode 100644
index 54e5248ee..000000000
--- a/linux/atlassian/confluence/6/6.0.1/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.0.1 .
-
diff --git a/linux/atlassian/confluence/6/6.0.1/README.md b/linux/atlassian/confluence/6/6.0.1/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.0.1/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.0.2/Dockerfile b/linux/atlassian/confluence/6/6.0.2/Dockerfile
deleted file mode 100644
index 5d6a9c22f..000000000
--- a/linux/atlassian/confluence/6/6.0.2/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.0.2
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.0.2/Makefile b/linux/atlassian/confluence/6/6.0.2/Makefile
deleted file mode 100644
index bf0b01cd0..000000000
--- a/linux/atlassian/confluence/6/6.0.2/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.0.2 .
-
diff --git a/linux/atlassian/confluence/6/6.0.2/README.md b/linux/atlassian/confluence/6/6.0.2/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.0.2/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.0.3/Dockerfile b/linux/atlassian/confluence/6/6.0.3/Dockerfile
deleted file mode 100644
index 477bff4c3..000000000
--- a/linux/atlassian/confluence/6/6.0.3/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.0.3
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.0.3/Makefile b/linux/atlassian/confluence/6/6.0.3/Makefile
deleted file mode 100644
index 600150ad2..000000000
--- a/linux/atlassian/confluence/6/6.0.3/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.0.3 .
-
diff --git a/linux/atlassian/confluence/6/6.0.3/README.md b/linux/atlassian/confluence/6/6.0.3/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.0.3/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.0.4/Dockerfile b/linux/atlassian/confluence/6/6.0.4/Dockerfile
deleted file mode 100644
index 67f277e57..000000000
--- a/linux/atlassian/confluence/6/6.0.4/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.0.4
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.0.4/Makefile b/linux/atlassian/confluence/6/6.0.4/Makefile
deleted file mode 100644
index 295c8f338..000000000
--- a/linux/atlassian/confluence/6/6.0.4/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.0.4 .
-
diff --git a/linux/atlassian/confluence/6/6.0.4/README.md b/linux/atlassian/confluence/6/6.0.4/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.0.4/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.0.5/Dockerfile b/linux/atlassian/confluence/6/6.0.5/Dockerfile
deleted file mode 100644
index 7402d12b4..000000000
--- a/linux/atlassian/confluence/6/6.0.5/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.0.5
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.0.5/Makefile b/linux/atlassian/confluence/6/6.0.5/Makefile
deleted file mode 100644
index df010b00f..000000000
--- a/linux/atlassian/confluence/6/6.0.5/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.0.5 .
-
diff --git a/linux/atlassian/confluence/6/6.0.5/README.md b/linux/atlassian/confluence/6/6.0.5/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.0.5/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.0.6/Dockerfile b/linux/atlassian/confluence/6/6.0.6/Dockerfile
deleted file mode 100644
index 54aab7128..000000000
--- a/linux/atlassian/confluence/6/6.0.6/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.0.6
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.0.6/Makefile b/linux/atlassian/confluence/6/6.0.6/Makefile
deleted file mode 100644
index 415f855d5..000000000
--- a/linux/atlassian/confluence/6/6.0.6/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.0.6 .
-
diff --git a/linux/atlassian/confluence/6/6.0.6/README.md b/linux/atlassian/confluence/6/6.0.6/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.0.6/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.0.7/Dockerfile b/linux/atlassian/confluence/6/6.0.7/Dockerfile
deleted file mode 100644
index 62a0c388c..000000000
--- a/linux/atlassian/confluence/6/6.0.7/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.0.7
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.0.7/Makefile b/linux/atlassian/confluence/6/6.0.7/Makefile
deleted file mode 100644
index 319483387..000000000
--- a/linux/atlassian/confluence/6/6.0.7/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.0.7 .
-
diff --git a/linux/atlassian/confluence/6/6.0.7/README.md b/linux/atlassian/confluence/6/6.0.7/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.0.7/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.1.0/Dockerfile b/linux/atlassian/confluence/6/6.1.0/Dockerfile
deleted file mode 100644
index 9e5c98eb9..000000000
--- a/linux/atlassian/confluence/6/6.1.0/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.1.0
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.1.0/Makefile b/linux/atlassian/confluence/6/6.1.0/Makefile
deleted file mode 100644
index a85eda5df..000000000
--- a/linux/atlassian/confluence/6/6.1.0/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.1.0 .
-
diff --git a/linux/atlassian/confluence/6/6.1.0/README.md b/linux/atlassian/confluence/6/6.1.0/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.1.0/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.1.1/Dockerfile b/linux/atlassian/confluence/6/6.1.1/Dockerfile
deleted file mode 100644
index 66b185a7e..000000000
--- a/linux/atlassian/confluence/6/6.1.1/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.1.1
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.1.1/Makefile b/linux/atlassian/confluence/6/6.1.1/Makefile
deleted file mode 100644
index 79cbcdbfb..000000000
--- a/linux/atlassian/confluence/6/6.1.1/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.1.1 .
-
diff --git a/linux/atlassian/confluence/6/6.1.1/README.md b/linux/atlassian/confluence/6/6.1.1/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.1.1/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.1.2/Dockerfile b/linux/atlassian/confluence/6/6.1.2/Dockerfile
deleted file mode 100644
index 1a8620f8d..000000000
--- a/linux/atlassian/confluence/6/6.1.2/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.1.2
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.1.2/Makefile b/linux/atlassian/confluence/6/6.1.2/Makefile
deleted file mode 100644
index 384fecef4..000000000
--- a/linux/atlassian/confluence/6/6.1.2/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.1.2 .
-
diff --git a/linux/atlassian/confluence/6/6.1.2/README.md b/linux/atlassian/confluence/6/6.1.2/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.1.2/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.1.3/Dockerfile b/linux/atlassian/confluence/6/6.1.3/Dockerfile
deleted file mode 100644
index 8bde4a010..000000000
--- a/linux/atlassian/confluence/6/6.1.3/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.1.3
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.1.3/Makefile b/linux/atlassian/confluence/6/6.1.3/Makefile
deleted file mode 100644
index 5123e62e9..000000000
--- a/linux/atlassian/confluence/6/6.1.3/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.1.3 .
-
diff --git a/linux/atlassian/confluence/6/6.1.3/README.md b/linux/atlassian/confluence/6/6.1.3/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.1.3/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.1.4/Dockerfile b/linux/atlassian/confluence/6/6.1.4/Dockerfile
deleted file mode 100644
index 57b685395..000000000
--- a/linux/atlassian/confluence/6/6.1.4/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.1.4
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.1.4/Makefile b/linux/atlassian/confluence/6/6.1.4/Makefile
deleted file mode 100644
index 06c417023..000000000
--- a/linux/atlassian/confluence/6/6.1.4/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.1.4 .
-
diff --git a/linux/atlassian/confluence/6/6.1.4/README.md b/linux/atlassian/confluence/6/6.1.4/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.1.4/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.10.0/Dockerfile b/linux/atlassian/confluence/6/6.10.0/Dockerfile
deleted file mode 100644
index 4ad1fde3c..000000000
--- a/linux/atlassian/confluence/6/6.10.0/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.10.0
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.10.0/Makefile b/linux/atlassian/confluence/6/6.10.0/Makefile
deleted file mode 100644
index 51889d9ce..000000000
--- a/linux/atlassian/confluence/6/6.10.0/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.10.0 .
diff --git a/linux/atlassian/confluence/6/6.10.0/README.md b/linux/atlassian/confluence/6/6.10.0/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.10.0/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.10.1/Dockerfile b/linux/atlassian/confluence/6/6.10.1/Dockerfile
deleted file mode 100644
index 03804167e..000000000
--- a/linux/atlassian/confluence/6/6.10.1/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.10.1
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.10.1/Makefile b/linux/atlassian/confluence/6/6.10.1/Makefile
deleted file mode 100644
index 2075e3608..000000000
--- a/linux/atlassian/confluence/6/6.10.1/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.10.1 .
diff --git a/linux/atlassian/confluence/6/6.10.1/README.md b/linux/atlassian/confluence/6/6.10.1/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.10.1/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.10.2/Dockerfile b/linux/atlassian/confluence/6/6.10.2/Dockerfile
deleted file mode 100644
index b7a0eabd0..000000000
--- a/linux/atlassian/confluence/6/6.10.2/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.10.2
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.10.2/Makefile b/linux/atlassian/confluence/6/6.10.2/Makefile
deleted file mode 100644
index 1e0cf78ce..000000000
--- a/linux/atlassian/confluence/6/6.10.2/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.10.2 .
diff --git a/linux/atlassian/confluence/6/6.10.2/README.md b/linux/atlassian/confluence/6/6.10.2/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.10.2/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.10.3/Dockerfile b/linux/atlassian/confluence/6/6.10.3/Dockerfile
deleted file mode 100644
index 0f996919e..000000000
--- a/linux/atlassian/confluence/6/6.10.3/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.10.3
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.10.3/Makefile b/linux/atlassian/confluence/6/6.10.3/Makefile
deleted file mode 100644
index 3efab142b..000000000
--- a/linux/atlassian/confluence/6/6.10.3/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.10.3 .
diff --git a/linux/atlassian/confluence/6/6.10.3/README.md b/linux/atlassian/confluence/6/6.10.3/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.10.3/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.11.0/Dockerfile b/linux/atlassian/confluence/6/6.11.0/Dockerfile
deleted file mode 100644
index a398499dc..000000000
--- a/linux/atlassian/confluence/6/6.11.0/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.11.0
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.11.0/Makefile b/linux/atlassian/confluence/6/6.11.0/Makefile
deleted file mode 100644
index 91ac02ec4..000000000
--- a/linux/atlassian/confluence/6/6.11.0/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.11.0 .
diff --git a/linux/atlassian/confluence/6/6.11.0/README.md b/linux/atlassian/confluence/6/6.11.0/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.11.0/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.11.1/Dockerfile b/linux/atlassian/confluence/6/6.11.1/Dockerfile
deleted file mode 100644
index b9f04c9fa..000000000
--- a/linux/atlassian/confluence/6/6.11.1/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.11.1
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.11.1/Makefile b/linux/atlassian/confluence/6/6.11.1/Makefile
deleted file mode 100644
index 91b13f5a3..000000000
--- a/linux/atlassian/confluence/6/6.11.1/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.11.1 .
diff --git a/linux/atlassian/confluence/6/6.11.1/README.md b/linux/atlassian/confluence/6/6.11.1/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.11.1/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.11.2/Dockerfile b/linux/atlassian/confluence/6/6.11.2/Dockerfile
deleted file mode 100644
index 68b11e92e..000000000
--- a/linux/atlassian/confluence/6/6.11.2/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.11.2
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.11.2/Makefile b/linux/atlassian/confluence/6/6.11.2/Makefile
deleted file mode 100644
index 33190fa54..000000000
--- a/linux/atlassian/confluence/6/6.11.2/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.11.2 .
diff --git a/linux/atlassian/confluence/6/6.11.2/README.md b/linux/atlassian/confluence/6/6.11.2/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.11.2/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.12.0/Dockerfile b/linux/atlassian/confluence/6/6.12.0/Dockerfile
deleted file mode 100644
index 1dc6fad00..000000000
--- a/linux/atlassian/confluence/6/6.12.0/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.12.0
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.12.0/Makefile b/linux/atlassian/confluence/6/6.12.0/Makefile
deleted file mode 100644
index 8cda2e8c5..000000000
--- a/linux/atlassian/confluence/6/6.12.0/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.12.0 .
diff --git a/linux/atlassian/confluence/6/6.12.0/README.md b/linux/atlassian/confluence/6/6.12.0/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.12.0/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.12.1/Dockerfile b/linux/atlassian/confluence/6/6.12.1/Dockerfile
deleted file mode 100644
index 4bbf92616..000000000
--- a/linux/atlassian/confluence/6/6.12.1/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.12.1
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.12.1/Makefile b/linux/atlassian/confluence/6/6.12.1/Makefile
deleted file mode 100644
index 0c8f696cd..000000000
--- a/linux/atlassian/confluence/6/6.12.1/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.12.1 .
diff --git a/linux/atlassian/confluence/6/6.12.1/README.md b/linux/atlassian/confluence/6/6.12.1/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.12.1/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.12.2/Dockerfile b/linux/atlassian/confluence/6/6.12.2/Dockerfile
deleted file mode 100644
index 5371f2910..000000000
--- a/linux/atlassian/confluence/6/6.12.2/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.12.2
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.12.2/Makefile b/linux/atlassian/confluence/6/6.12.2/Makefile
deleted file mode 100644
index 816ec3bd7..000000000
--- a/linux/atlassian/confluence/6/6.12.2/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.12.2 .
diff --git a/linux/atlassian/confluence/6/6.12.2/README.md b/linux/atlassian/confluence/6/6.12.2/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.12.2/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.12.3/Dockerfile b/linux/atlassian/confluence/6/6.12.3/Dockerfile
deleted file mode 100644
index 754b5b423..000000000
--- a/linux/atlassian/confluence/6/6.12.3/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.12.3
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.12.3/Makefile b/linux/atlassian/confluence/6/6.12.3/Makefile
deleted file mode 100644
index bcc05628a..000000000
--- a/linux/atlassian/confluence/6/6.12.3/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.12.3 .
diff --git a/linux/atlassian/confluence/6/6.12.3/README.md b/linux/atlassian/confluence/6/6.12.3/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.12.3/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.12.4/Dockerfile b/linux/atlassian/confluence/6/6.12.4/Dockerfile
deleted file mode 100644
index e19663666..000000000
--- a/linux/atlassian/confluence/6/6.12.4/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.12.4
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.12.4/Makefile b/linux/atlassian/confluence/6/6.12.4/Makefile
deleted file mode 100644
index 48b1ff9b2..000000000
--- a/linux/atlassian/confluence/6/6.12.4/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.12.4 .
diff --git a/linux/atlassian/confluence/6/6.12.4/README.md b/linux/atlassian/confluence/6/6.12.4/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.12.4/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.13.0/Dockerfile b/linux/atlassian/confluence/6/6.13.0/Dockerfile
deleted file mode 100644
index ccb8e85b9..000000000
--- a/linux/atlassian/confluence/6/6.13.0/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.13.0
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.13.0/Makefile b/linux/atlassian/confluence/6/6.13.0/Makefile
deleted file mode 100644
index bef0eb44c..000000000
--- a/linux/atlassian/confluence/6/6.13.0/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.13.0 .
diff --git a/linux/atlassian/confluence/6/6.13.0/README.md b/linux/atlassian/confluence/6/6.13.0/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.13.0/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.13.1/Dockerfile b/linux/atlassian/confluence/6/6.13.1/Dockerfile
deleted file mode 100644
index d443befb1..000000000
--- a/linux/atlassian/confluence/6/6.13.1/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.13.1
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.13.1/Makefile b/linux/atlassian/confluence/6/6.13.1/Makefile
deleted file mode 100644
index 59ba9a277..000000000
--- a/linux/atlassian/confluence/6/6.13.1/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.13.1 .
diff --git a/linux/atlassian/confluence/6/6.13.1/README.md b/linux/atlassian/confluence/6/6.13.1/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.13.1/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.13.10/Dockerfile b/linux/atlassian/confluence/6/6.13.10/Dockerfile
deleted file mode 100644
index 819172b1e..000000000
--- a/linux/atlassian/confluence/6/6.13.10/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.13.10
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.13.10/Makefile b/linux/atlassian/confluence/6/6.13.10/Makefile
deleted file mode 100644
index ae06f9246..000000000
--- a/linux/atlassian/confluence/6/6.13.10/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.13.10 .
diff --git a/linux/atlassian/confluence/6/6.13.10/README.md b/linux/atlassian/confluence/6/6.13.10/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.13.10/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.13.11/Dockerfile b/linux/atlassian/confluence/6/6.13.11/Dockerfile
deleted file mode 100644
index 9f2dec9ed..000000000
--- a/linux/atlassian/confluence/6/6.13.11/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.13.11
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.13.11/Makefile b/linux/atlassian/confluence/6/6.13.11/Makefile
deleted file mode 100644
index 01b6b55e6..000000000
--- a/linux/atlassian/confluence/6/6.13.11/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.13.11 .
- docker push epicmorg/confluence:6.13.11
diff --git a/linux/atlassian/confluence/6/6.13.11/README.md b/linux/atlassian/confluence/6/6.13.11/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.13.11/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.13.2/Dockerfile b/linux/atlassian/confluence/6/6.13.2/Dockerfile
deleted file mode 100644
index d70d32f7e..000000000
--- a/linux/atlassian/confluence/6/6.13.2/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.13.2
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.13.2/Makefile b/linux/atlassian/confluence/6/6.13.2/Makefile
deleted file mode 100644
index 0d0a349b3..000000000
--- a/linux/atlassian/confluence/6/6.13.2/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.13.2 .
diff --git a/linux/atlassian/confluence/6/6.13.2/README.md b/linux/atlassian/confluence/6/6.13.2/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.13.2/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.13.3/Dockerfile b/linux/atlassian/confluence/6/6.13.3/Dockerfile
deleted file mode 100644
index 9b3339a01..000000000
--- a/linux/atlassian/confluence/6/6.13.3/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.13.3
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.13.3/Makefile b/linux/atlassian/confluence/6/6.13.3/Makefile
deleted file mode 100644
index b5dd0c1af..000000000
--- a/linux/atlassian/confluence/6/6.13.3/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.13.3 .
diff --git a/linux/atlassian/confluence/6/6.13.3/README.md b/linux/atlassian/confluence/6/6.13.3/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.13.3/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.13.4/Dockerfile b/linux/atlassian/confluence/6/6.13.4/Dockerfile
deleted file mode 100644
index 754b6e94f..000000000
--- a/linux/atlassian/confluence/6/6.13.4/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.13.4
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.13.4/Makefile b/linux/atlassian/confluence/6/6.13.4/Makefile
deleted file mode 100644
index 151d74550..000000000
--- a/linux/atlassian/confluence/6/6.13.4/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.13.4 .
diff --git a/linux/atlassian/confluence/6/6.13.4/README.md b/linux/atlassian/confluence/6/6.13.4/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.13.4/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.13.5/Dockerfile b/linux/atlassian/confluence/6/6.13.5/Dockerfile
deleted file mode 100644
index a3a26f6c1..000000000
--- a/linux/atlassian/confluence/6/6.13.5/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.13.5
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.13.5/Makefile b/linux/atlassian/confluence/6/6.13.5/Makefile
deleted file mode 100644
index 51b8004b9..000000000
--- a/linux/atlassian/confluence/6/6.13.5/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.13.5 .
diff --git a/linux/atlassian/confluence/6/6.13.5/README.md b/linux/atlassian/confluence/6/6.13.5/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.13.5/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.13.6/Dockerfile b/linux/atlassian/confluence/6/6.13.6/Dockerfile
deleted file mode 100644
index e7ddfccfd..000000000
--- a/linux/atlassian/confluence/6/6.13.6/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.13.6
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.13.6/Makefile b/linux/atlassian/confluence/6/6.13.6/Makefile
deleted file mode 100644
index f97a67aac..000000000
--- a/linux/atlassian/confluence/6/6.13.6/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.13.6 .
diff --git a/linux/atlassian/confluence/6/6.13.6/README.md b/linux/atlassian/confluence/6/6.13.6/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.13.6/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.13.7/Dockerfile b/linux/atlassian/confluence/6/6.13.7/Dockerfile
deleted file mode 100644
index ec43a52b7..000000000
--- a/linux/atlassian/confluence/6/6.13.7/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.13.7
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.13.7/Makefile b/linux/atlassian/confluence/6/6.13.7/Makefile
deleted file mode 100644
index 67ea1401b..000000000
--- a/linux/atlassian/confluence/6/6.13.7/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.13.7 .
diff --git a/linux/atlassian/confluence/6/6.13.7/README.md b/linux/atlassian/confluence/6/6.13.7/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.13.7/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.13.8/Dockerfile b/linux/atlassian/confluence/6/6.13.8/Dockerfile
deleted file mode 100644
index f31478c3f..000000000
--- a/linux/atlassian/confluence/6/6.13.8/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.13.8
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.13.8/Makefile b/linux/atlassian/confluence/6/6.13.8/Makefile
deleted file mode 100644
index 40f704f85..000000000
--- a/linux/atlassian/confluence/6/6.13.8/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.13.8 .
diff --git a/linux/atlassian/confluence/6/6.13.8/README.md b/linux/atlassian/confluence/6/6.13.8/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.13.8/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.13.9/Dockerfile b/linux/atlassian/confluence/6/6.13.9/Dockerfile
deleted file mode 100644
index 23d27cfbd..000000000
--- a/linux/atlassian/confluence/6/6.13.9/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.13.9
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.13.9/Makefile b/linux/atlassian/confluence/6/6.13.9/Makefile
deleted file mode 100644
index 123908ce1..000000000
--- a/linux/atlassian/confluence/6/6.13.9/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.13.9 .
diff --git a/linux/atlassian/confluence/6/6.13.9/README.md b/linux/atlassian/confluence/6/6.13.9/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.13.9/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.14.0/Dockerfile b/linux/atlassian/confluence/6/6.14.0/Dockerfile
deleted file mode 100644
index 75528b59f..000000000
--- a/linux/atlassian/confluence/6/6.14.0/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.14.0
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.14.0/Makefile b/linux/atlassian/confluence/6/6.14.0/Makefile
deleted file mode 100644
index a108c8aac..000000000
--- a/linux/atlassian/confluence/6/6.14.0/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.14.0 .
diff --git a/linux/atlassian/confluence/6/6.14.0/README.md b/linux/atlassian/confluence/6/6.14.0/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.14.0/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.14.1/Dockerfile b/linux/atlassian/confluence/6/6.14.1/Dockerfile
deleted file mode 100644
index 1afce19ac..000000000
--- a/linux/atlassian/confluence/6/6.14.1/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.14.1
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.14.1/Makefile b/linux/atlassian/confluence/6/6.14.1/Makefile
deleted file mode 100644
index 10c887145..000000000
--- a/linux/atlassian/confluence/6/6.14.1/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.14.1 .
diff --git a/linux/atlassian/confluence/6/6.14.1/README.md b/linux/atlassian/confluence/6/6.14.1/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.14.1/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.14.2/Dockerfile b/linux/atlassian/confluence/6/6.14.2/Dockerfile
deleted file mode 100644
index 9c09f9aa0..000000000
--- a/linux/atlassian/confluence/6/6.14.2/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.14.2
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.14.2/Makefile b/linux/atlassian/confluence/6/6.14.2/Makefile
deleted file mode 100644
index 20d0be562..000000000
--- a/linux/atlassian/confluence/6/6.14.2/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.14.2 .
diff --git a/linux/atlassian/confluence/6/6.14.2/README.md b/linux/atlassian/confluence/6/6.14.2/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.14.2/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.14.3/Dockerfile b/linux/atlassian/confluence/6/6.14.3/Dockerfile
deleted file mode 100644
index 09045771f..000000000
--- a/linux/atlassian/confluence/6/6.14.3/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.14.3
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.14.3/Makefile b/linux/atlassian/confluence/6/6.14.3/Makefile
deleted file mode 100644
index 64d461d63..000000000
--- a/linux/atlassian/confluence/6/6.14.3/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.14.3 .
diff --git a/linux/atlassian/confluence/6/6.14.3/README.md b/linux/atlassian/confluence/6/6.14.3/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.14.3/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.15.1/Dockerfile b/linux/atlassian/confluence/6/6.15.1/Dockerfile
deleted file mode 100644
index b4760d22a..000000000
--- a/linux/atlassian/confluence/6/6.15.1/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.15.1
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.15.1/Makefile b/linux/atlassian/confluence/6/6.15.1/Makefile
deleted file mode 100644
index 8562af6a9..000000000
--- a/linux/atlassian/confluence/6/6.15.1/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.15.1 .
diff --git a/linux/atlassian/confluence/6/6.15.1/README.md b/linux/atlassian/confluence/6/6.15.1/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.15.1/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.15.10/Dockerfile b/linux/atlassian/confluence/6/6.15.10/Dockerfile
deleted file mode 100644
index 390873ab3..000000000
--- a/linux/atlassian/confluence/6/6.15.10/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.15.10
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.15.10/Makefile b/linux/atlassian/confluence/6/6.15.10/Makefile
deleted file mode 100644
index ac511814c..000000000
--- a/linux/atlassian/confluence/6/6.15.10/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.15.10 .
diff --git a/linux/atlassian/confluence/6/6.15.10/README.md b/linux/atlassian/confluence/6/6.15.10/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.15.10/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.15.2/Dockerfile b/linux/atlassian/confluence/6/6.15.2/Dockerfile
deleted file mode 100644
index 8f3f731e4..000000000
--- a/linux/atlassian/confluence/6/6.15.2/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.15.2
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.15.2/Makefile b/linux/atlassian/confluence/6/6.15.2/Makefile
deleted file mode 100644
index 49f7f4b47..000000000
--- a/linux/atlassian/confluence/6/6.15.2/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.15.2 .
diff --git a/linux/atlassian/confluence/6/6.15.2/README.md b/linux/atlassian/confluence/6/6.15.2/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.15.2/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.15.4/Dockerfile b/linux/atlassian/confluence/6/6.15.4/Dockerfile
deleted file mode 100644
index bd22b9524..000000000
--- a/linux/atlassian/confluence/6/6.15.4/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.15.4
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.15.4/Makefile b/linux/atlassian/confluence/6/6.15.4/Makefile
deleted file mode 100644
index b578eca08..000000000
--- a/linux/atlassian/confluence/6/6.15.4/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.15.4 .
diff --git a/linux/atlassian/confluence/6/6.15.4/README.md b/linux/atlassian/confluence/6/6.15.4/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.15.4/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.15.6/Dockerfile b/linux/atlassian/confluence/6/6.15.6/Dockerfile
deleted file mode 100644
index 7ded10ca3..000000000
--- a/linux/atlassian/confluence/6/6.15.6/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.15.6
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.15.6/Makefile b/linux/atlassian/confluence/6/6.15.6/Makefile
deleted file mode 100644
index 960c9cff3..000000000
--- a/linux/atlassian/confluence/6/6.15.6/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.15.6 .
diff --git a/linux/atlassian/confluence/6/6.15.6/README.md b/linux/atlassian/confluence/6/6.15.6/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.15.6/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.15.7/Dockerfile b/linux/atlassian/confluence/6/6.15.7/Dockerfile
deleted file mode 100644
index fd475818d..000000000
--- a/linux/atlassian/confluence/6/6.15.7/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.15.7
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.15.7/Makefile b/linux/atlassian/confluence/6/6.15.7/Makefile
deleted file mode 100644
index c0d45c8e4..000000000
--- a/linux/atlassian/confluence/6/6.15.7/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.15.7 .
diff --git a/linux/atlassian/confluence/6/6.15.7/README.md b/linux/atlassian/confluence/6/6.15.7/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.15.7/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.15.8/Dockerfile b/linux/atlassian/confluence/6/6.15.8/Dockerfile
deleted file mode 100644
index 88eb7769b..000000000
--- a/linux/atlassian/confluence/6/6.15.8/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.15.8
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.15.8/Makefile b/linux/atlassian/confluence/6/6.15.8/Makefile
deleted file mode 100644
index daca62370..000000000
--- a/linux/atlassian/confluence/6/6.15.8/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.15.8 .
diff --git a/linux/atlassian/confluence/6/6.15.8/README.md b/linux/atlassian/confluence/6/6.15.8/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.15.8/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.15.9/Dockerfile b/linux/atlassian/confluence/6/6.15.9/Dockerfile
deleted file mode 100644
index d3ce10616..000000000
--- a/linux/atlassian/confluence/6/6.15.9/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.15.9
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.15.9/Makefile b/linux/atlassian/confluence/6/6.15.9/Makefile
deleted file mode 100644
index 1383a8baf..000000000
--- a/linux/atlassian/confluence/6/6.15.9/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.15.9 .
diff --git a/linux/atlassian/confluence/6/6.15.9/README.md b/linux/atlassian/confluence/6/6.15.9/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.15.9/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.2.0/Dockerfile b/linux/atlassian/confluence/6/6.2.0/Dockerfile
deleted file mode 100644
index 2918977a7..000000000
--- a/linux/atlassian/confluence/6/6.2.0/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.2.0
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.2.0/Makefile b/linux/atlassian/confluence/6/6.2.0/Makefile
deleted file mode 100644
index 64a2b71a2..000000000
--- a/linux/atlassian/confluence/6/6.2.0/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.2.0 .
-
diff --git a/linux/atlassian/confluence/6/6.2.0/README.md b/linux/atlassian/confluence/6/6.2.0/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.2.0/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.2.1/Dockerfile b/linux/atlassian/confluence/6/6.2.1/Dockerfile
deleted file mode 100644
index a92c188e7..000000000
--- a/linux/atlassian/confluence/6/6.2.1/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.2.1
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.2.1/Makefile b/linux/atlassian/confluence/6/6.2.1/Makefile
deleted file mode 100644
index 579cfc2a0..000000000
--- a/linux/atlassian/confluence/6/6.2.1/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.2.1 .
-
diff --git a/linux/atlassian/confluence/6/6.2.1/README.md b/linux/atlassian/confluence/6/6.2.1/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.2.1/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.2.3/Dockerfile b/linux/atlassian/confluence/6/6.2.3/Dockerfile
deleted file mode 100644
index 6cb8e82b0..000000000
--- a/linux/atlassian/confluence/6/6.2.3/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.2.3
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.2.3/Makefile b/linux/atlassian/confluence/6/6.2.3/Makefile
deleted file mode 100644
index 4e065a590..000000000
--- a/linux/atlassian/confluence/6/6.2.3/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.2.3 .
-
diff --git a/linux/atlassian/confluence/6/6.2.3/README.md b/linux/atlassian/confluence/6/6.2.3/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.2.3/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.2.4/Dockerfile b/linux/atlassian/confluence/6/6.2.4/Dockerfile
deleted file mode 100644
index 5a6774b8b..000000000
--- a/linux/atlassian/confluence/6/6.2.4/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.2.4
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.2.4/Makefile b/linux/atlassian/confluence/6/6.2.4/Makefile
deleted file mode 100644
index da230e169..000000000
--- a/linux/atlassian/confluence/6/6.2.4/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.2.4 .
-
diff --git a/linux/atlassian/confluence/6/6.2.4/README.md b/linux/atlassian/confluence/6/6.2.4/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.2.4/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.3.1/Dockerfile b/linux/atlassian/confluence/6/6.3.1/Dockerfile
deleted file mode 100644
index 5427ff517..000000000
--- a/linux/atlassian/confluence/6/6.3.1/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.3.1
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.3.1/Makefile b/linux/atlassian/confluence/6/6.3.1/Makefile
deleted file mode 100644
index 5a829cec6..000000000
--- a/linux/atlassian/confluence/6/6.3.1/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.3.1 .
-
diff --git a/linux/atlassian/confluence/6/6.3.1/README.md b/linux/atlassian/confluence/6/6.3.1/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.3.1/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.3.2/Dockerfile b/linux/atlassian/confluence/6/6.3.2/Dockerfile
deleted file mode 100644
index 966862883..000000000
--- a/linux/atlassian/confluence/6/6.3.2/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.3.2
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.3.2/Makefile b/linux/atlassian/confluence/6/6.3.2/Makefile
deleted file mode 100644
index 87cb02a13..000000000
--- a/linux/atlassian/confluence/6/6.3.2/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.3.2 .
-
diff --git a/linux/atlassian/confluence/6/6.3.2/README.md b/linux/atlassian/confluence/6/6.3.2/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.3.2/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.3.3/Dockerfile b/linux/atlassian/confluence/6/6.3.3/Dockerfile
deleted file mode 100644
index 0538b7412..000000000
--- a/linux/atlassian/confluence/6/6.3.3/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.3.3
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.3.3/Makefile b/linux/atlassian/confluence/6/6.3.3/Makefile
deleted file mode 100644
index 3fbdcf9e3..000000000
--- a/linux/atlassian/confluence/6/6.3.3/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.3.3 .
-
diff --git a/linux/atlassian/confluence/6/6.3.3/README.md b/linux/atlassian/confluence/6/6.3.3/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.3.3/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.3.4/Dockerfile b/linux/atlassian/confluence/6/6.3.4/Dockerfile
deleted file mode 100644
index c5943a421..000000000
--- a/linux/atlassian/confluence/6/6.3.4/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.3.4
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.3.4/Makefile b/linux/atlassian/confluence/6/6.3.4/Makefile
deleted file mode 100644
index 1505da964..000000000
--- a/linux/atlassian/confluence/6/6.3.4/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.3.4 .
-
diff --git a/linux/atlassian/confluence/6/6.3.4/README.md b/linux/atlassian/confluence/6/6.3.4/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.3.4/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.4.0/Dockerfile b/linux/atlassian/confluence/6/6.4.0/Dockerfile
deleted file mode 100644
index e54266583..000000000
--- a/linux/atlassian/confluence/6/6.4.0/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.4.0
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.4.0/Makefile b/linux/atlassian/confluence/6/6.4.0/Makefile
deleted file mode 100644
index dd3a24008..000000000
--- a/linux/atlassian/confluence/6/6.4.0/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.4.0 .
-
diff --git a/linux/atlassian/confluence/6/6.4.0/README.md b/linux/atlassian/confluence/6/6.4.0/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.4.0/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.4.1/Dockerfile b/linux/atlassian/confluence/6/6.4.1/Dockerfile
deleted file mode 100644
index 62c64bbde..000000000
--- a/linux/atlassian/confluence/6/6.4.1/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.4.1
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.4.1/Makefile b/linux/atlassian/confluence/6/6.4.1/Makefile
deleted file mode 100644
index 7379fec29..000000000
--- a/linux/atlassian/confluence/6/6.4.1/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.4.1 .
-
diff --git a/linux/atlassian/confluence/6/6.4.1/README.md b/linux/atlassian/confluence/6/6.4.1/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.4.1/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.4.2/Dockerfile b/linux/atlassian/confluence/6/6.4.2/Dockerfile
deleted file mode 100644
index d092f4d19..000000000
--- a/linux/atlassian/confluence/6/6.4.2/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.4.2
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.4.2/Makefile b/linux/atlassian/confluence/6/6.4.2/Makefile
deleted file mode 100644
index 34484b6ce..000000000
--- a/linux/atlassian/confluence/6/6.4.2/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.4.2 .
-
diff --git a/linux/atlassian/confluence/6/6.4.2/README.md b/linux/atlassian/confluence/6/6.4.2/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.4.2/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.4.3/Dockerfile b/linux/atlassian/confluence/6/6.4.3/Dockerfile
deleted file mode 100644
index 6281998aa..000000000
--- a/linux/atlassian/confluence/6/6.4.3/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.4.3
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.4.3/Makefile b/linux/atlassian/confluence/6/6.4.3/Makefile
deleted file mode 100644
index 888a64d97..000000000
--- a/linux/atlassian/confluence/6/6.4.3/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.4.3 .
-
diff --git a/linux/atlassian/confluence/6/6.4.3/README.md b/linux/atlassian/confluence/6/6.4.3/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.4.3/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.5.0/Dockerfile b/linux/atlassian/confluence/6/6.5.0/Dockerfile
deleted file mode 100644
index e674e1e53..000000000
--- a/linux/atlassian/confluence/6/6.5.0/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.5.0
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.5.0/Makefile b/linux/atlassian/confluence/6/6.5.0/Makefile
deleted file mode 100644
index a457b27b6..000000000
--- a/linux/atlassian/confluence/6/6.5.0/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.5.0 .
-
diff --git a/linux/atlassian/confluence/6/6.5.0/README.md b/linux/atlassian/confluence/6/6.5.0/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.5.0/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.5.1/Dockerfile b/linux/atlassian/confluence/6/6.5.1/Dockerfile
deleted file mode 100644
index fb30c69be..000000000
--- a/linux/atlassian/confluence/6/6.5.1/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.5.1
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.5.1/Makefile b/linux/atlassian/confluence/6/6.5.1/Makefile
deleted file mode 100644
index 10590eca2..000000000
--- a/linux/atlassian/confluence/6/6.5.1/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.5.1 .
-
diff --git a/linux/atlassian/confluence/6/6.5.1/README.md b/linux/atlassian/confluence/6/6.5.1/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.5.1/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.5.2/Dockerfile b/linux/atlassian/confluence/6/6.5.2/Dockerfile
deleted file mode 100644
index 6a5f7cc0f..000000000
--- a/linux/atlassian/confluence/6/6.5.2/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.5.2
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.5.2/Makefile b/linux/atlassian/confluence/6/6.5.2/Makefile
deleted file mode 100644
index d9dde7a8f..000000000
--- a/linux/atlassian/confluence/6/6.5.2/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.5.2 .
-
diff --git a/linux/atlassian/confluence/6/6.5.2/README.md b/linux/atlassian/confluence/6/6.5.2/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.5.2/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.5.3/Dockerfile b/linux/atlassian/confluence/6/6.5.3/Dockerfile
deleted file mode 100644
index f81e707cb..000000000
--- a/linux/atlassian/confluence/6/6.5.3/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.5.3
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.5.3/Makefile b/linux/atlassian/confluence/6/6.5.3/Makefile
deleted file mode 100644
index 1e1b17a1a..000000000
--- a/linux/atlassian/confluence/6/6.5.3/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.5.3 .
-
diff --git a/linux/atlassian/confluence/6/6.5.3/README.md b/linux/atlassian/confluence/6/6.5.3/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.5.3/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.6.0/Dockerfile b/linux/atlassian/confluence/6/6.6.0/Dockerfile
deleted file mode 100644
index b0850304f..000000000
--- a/linux/atlassian/confluence/6/6.6.0/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.6.0
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.6.0/Makefile b/linux/atlassian/confluence/6/6.6.0/Makefile
deleted file mode 100644
index 1876076f1..000000000
--- a/linux/atlassian/confluence/6/6.6.0/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.6.0 .
-
diff --git a/linux/atlassian/confluence/6/6.6.0/README.md b/linux/atlassian/confluence/6/6.6.0/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.6.0/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.6.1/Dockerfile b/linux/atlassian/confluence/6/6.6.1/Dockerfile
deleted file mode 100644
index 1608677f8..000000000
--- a/linux/atlassian/confluence/6/6.6.1/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.6.1
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.6.1/Makefile b/linux/atlassian/confluence/6/6.6.1/Makefile
deleted file mode 100644
index 9127a3ae2..000000000
--- a/linux/atlassian/confluence/6/6.6.1/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.6.1 .
-
diff --git a/linux/atlassian/confluence/6/6.6.1/README.md b/linux/atlassian/confluence/6/6.6.1/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.6.1/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.6.10/Dockerfile b/linux/atlassian/confluence/6/6.6.10/Dockerfile
deleted file mode 100644
index eb33e2439..000000000
--- a/linux/atlassian/confluence/6/6.6.10/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.6.10
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.6.10/Makefile b/linux/atlassian/confluence/6/6.6.10/Makefile
deleted file mode 100644
index e322ce139..000000000
--- a/linux/atlassian/confluence/6/6.6.10/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.6.10 .
-
diff --git a/linux/atlassian/confluence/6/6.6.10/README.md b/linux/atlassian/confluence/6/6.6.10/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.6.10/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.6.11/Dockerfile b/linux/atlassian/confluence/6/6.6.11/Dockerfile
deleted file mode 100644
index 65d9e9233..000000000
--- a/linux/atlassian/confluence/6/6.6.11/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.6.11
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.6.11/Makefile b/linux/atlassian/confluence/6/6.6.11/Makefile
deleted file mode 100644
index 42ff0164d..000000000
--- a/linux/atlassian/confluence/6/6.6.11/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.6.11 .
-
diff --git a/linux/atlassian/confluence/6/6.6.11/README.md b/linux/atlassian/confluence/6/6.6.11/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.6.11/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.6.12/Dockerfile b/linux/atlassian/confluence/6/6.6.12/Dockerfile
deleted file mode 100644
index 17da76ab4..000000000
--- a/linux/atlassian/confluence/6/6.6.12/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.6.12
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.6.12/Makefile b/linux/atlassian/confluence/6/6.6.12/Makefile
deleted file mode 100644
index 29ec4ae8d..000000000
--- a/linux/atlassian/confluence/6/6.6.12/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.6.12 .
-
diff --git a/linux/atlassian/confluence/6/6.6.12/README.md b/linux/atlassian/confluence/6/6.6.12/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.6.12/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.6.13/Dockerfile b/linux/atlassian/confluence/6/6.6.13/Dockerfile
deleted file mode 100644
index cd6f7d0e5..000000000
--- a/linux/atlassian/confluence/6/6.6.13/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.6.13
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.6.13/Makefile b/linux/atlassian/confluence/6/6.6.13/Makefile
deleted file mode 100644
index 4a5e342e0..000000000
--- a/linux/atlassian/confluence/6/6.6.13/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.6.13 .
-
diff --git a/linux/atlassian/confluence/6/6.6.13/README.md b/linux/atlassian/confluence/6/6.6.13/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.6.13/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.6.14/Dockerfile b/linux/atlassian/confluence/6/6.6.14/Dockerfile
deleted file mode 100644
index 88534111b..000000000
--- a/linux/atlassian/confluence/6/6.6.14/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.6.14
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.6.14/Makefile b/linux/atlassian/confluence/6/6.6.14/Makefile
deleted file mode 100644
index c07283d88..000000000
--- a/linux/atlassian/confluence/6/6.6.14/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.6.14 .
-
diff --git a/linux/atlassian/confluence/6/6.6.14/README.md b/linux/atlassian/confluence/6/6.6.14/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.6.14/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.6.15/Dockerfile b/linux/atlassian/confluence/6/6.6.15/Dockerfile
deleted file mode 100644
index 65fd33268..000000000
--- a/linux/atlassian/confluence/6/6.6.15/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.6.15
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.6.15/Makefile b/linux/atlassian/confluence/6/6.6.15/Makefile
deleted file mode 100644
index c16e574e6..000000000
--- a/linux/atlassian/confluence/6/6.6.15/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.6.15 .
-
diff --git a/linux/atlassian/confluence/6/6.6.15/README.md b/linux/atlassian/confluence/6/6.6.15/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.6.15/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.6.17/Dockerfile b/linux/atlassian/confluence/6/6.6.17/Dockerfile
deleted file mode 100644
index 554b5841a..000000000
--- a/linux/atlassian/confluence/6/6.6.17/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.6.17
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.6.17/Makefile b/linux/atlassian/confluence/6/6.6.17/Makefile
deleted file mode 100644
index 356dd5709..000000000
--- a/linux/atlassian/confluence/6/6.6.17/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.6.17 .
-
diff --git a/linux/atlassian/confluence/6/6.6.17/README.md b/linux/atlassian/confluence/6/6.6.17/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.6.17/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.6.2/Dockerfile b/linux/atlassian/confluence/6/6.6.2/Dockerfile
deleted file mode 100644
index e0bc6ea1b..000000000
--- a/linux/atlassian/confluence/6/6.6.2/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.6.2
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.6.2/Makefile b/linux/atlassian/confluence/6/6.6.2/Makefile
deleted file mode 100644
index d66002167..000000000
--- a/linux/atlassian/confluence/6/6.6.2/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.6.2 .
-
diff --git a/linux/atlassian/confluence/6/6.6.2/README.md b/linux/atlassian/confluence/6/6.6.2/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.6.2/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.6.3/Dockerfile b/linux/atlassian/confluence/6/6.6.3/Dockerfile
deleted file mode 100644
index a19bd9413..000000000
--- a/linux/atlassian/confluence/6/6.6.3/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.6.3
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.6.3/Makefile b/linux/atlassian/confluence/6/6.6.3/Makefile
deleted file mode 100644
index ecb5e0dd8..000000000
--- a/linux/atlassian/confluence/6/6.6.3/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.6.3 .
-
diff --git a/linux/atlassian/confluence/6/6.6.3/README.md b/linux/atlassian/confluence/6/6.6.3/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.6.3/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.6.4/Dockerfile b/linux/atlassian/confluence/6/6.6.4/Dockerfile
deleted file mode 100644
index 9c8864c32..000000000
--- a/linux/atlassian/confluence/6/6.6.4/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.6.4
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.6.4/Makefile b/linux/atlassian/confluence/6/6.6.4/Makefile
deleted file mode 100644
index 47c8828ca..000000000
--- a/linux/atlassian/confluence/6/6.6.4/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.6.4 .
-
diff --git a/linux/atlassian/confluence/6/6.6.4/README.md b/linux/atlassian/confluence/6/6.6.4/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.6.4/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.6.5/Dockerfile b/linux/atlassian/confluence/6/6.6.5/Dockerfile
deleted file mode 100644
index eec344827..000000000
--- a/linux/atlassian/confluence/6/6.6.5/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.6.5
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.6.5/Makefile b/linux/atlassian/confluence/6/6.6.5/Makefile
deleted file mode 100644
index 9bdd33e42..000000000
--- a/linux/atlassian/confluence/6/6.6.5/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.6.5 .
-
diff --git a/linux/atlassian/confluence/6/6.6.5/README.md b/linux/atlassian/confluence/6/6.6.5/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.6.5/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.6.6/Dockerfile b/linux/atlassian/confluence/6/6.6.6/Dockerfile
deleted file mode 100644
index cadb2a898..000000000
--- a/linux/atlassian/confluence/6/6.6.6/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.6.6
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.6.6/Makefile b/linux/atlassian/confluence/6/6.6.6/Makefile
deleted file mode 100644
index 8c37edc2f..000000000
--- a/linux/atlassian/confluence/6/6.6.6/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.6.6 .
-
diff --git a/linux/atlassian/confluence/6/6.6.6/README.md b/linux/atlassian/confluence/6/6.6.6/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.6.6/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.6.7/Dockerfile b/linux/atlassian/confluence/6/6.6.7/Dockerfile
deleted file mode 100644
index 2650f20ab..000000000
--- a/linux/atlassian/confluence/6/6.6.7/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.6.7
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.6.7/Makefile b/linux/atlassian/confluence/6/6.6.7/Makefile
deleted file mode 100644
index d091db002..000000000
--- a/linux/atlassian/confluence/6/6.6.7/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.6.7 .
-
diff --git a/linux/atlassian/confluence/6/6.6.7/README.md b/linux/atlassian/confluence/6/6.6.7/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.6.7/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.6.8/Dockerfile b/linux/atlassian/confluence/6/6.6.8/Dockerfile
deleted file mode 100644
index 408735cf7..000000000
--- a/linux/atlassian/confluence/6/6.6.8/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.6.8
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.6.8/Makefile b/linux/atlassian/confluence/6/6.6.8/Makefile
deleted file mode 100644
index d3628320b..000000000
--- a/linux/atlassian/confluence/6/6.6.8/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.6.8 .
-
diff --git a/linux/atlassian/confluence/6/6.6.8/README.md b/linux/atlassian/confluence/6/6.6.8/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.6.8/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.6.9/Dockerfile b/linux/atlassian/confluence/6/6.6.9/Dockerfile
deleted file mode 100644
index 5e3984215..000000000
--- a/linux/atlassian/confluence/6/6.6.9/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.6.9
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.6.9/Makefile b/linux/atlassian/confluence/6/6.6.9/Makefile
deleted file mode 100644
index 6206d1f00..000000000
--- a/linux/atlassian/confluence/6/6.6.9/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.6.9 .
-
diff --git a/linux/atlassian/confluence/6/6.6.9/README.md b/linux/atlassian/confluence/6/6.6.9/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.6.9/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at
-
-# Overview
-
-This Docker container makes it easy to get an instance of Confluence up and running.
-
-# Quick Start
-
-For the directory in the environmental variable `CONFLUENCE_HOME` that is used to store Confluence data
-(amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/userguide/dockervolumes/#mount-a-host-directory-as-a-data-volume):
-
-Start Atlassian Confluence Server:
-
- $> docker run -v /data/your-confluence-home:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-**Success**. Confluence is now available on [http://localhost:8090](http://localhost:8090)*
-
-Please ensure your container has the necessary resources allocated to it.
-We recommend 2GiB of memory allocated to accommodate the application server.
-See [Supported Platforms](https://confluence.atlassian.com/display/DOC/Supported+platforms) for further information.
-
-
-_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8090` instead._
-
-## Memory / Heap Size
-
-If you need to override Confluence Server's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables.
-
-* `JVM_MINIMUM_MEMORY` (default: 1024m)
-
- The minimum heap size of the JVM
-
-* `JVM_MAXIMUM_MEMORY` (default: 1024m)
-
- The maximum heap size of the JVM
-
-## Reverse Proxy Settings
-
-If Confluence is run behind a reverse proxy server, then you need to specify extra options to make Confluence aware of the setup. They can be controlled via the below environment variables.
-
-* `CATALINA_CONNECTOR_PROXYNAME` (default: NONE)
-
- The reverse proxy's fully qualified hostname.
-
-* `CATALINA_CONNECTOR_PROXYPORT` (default: NONE)
-
- The reverse proxy's port number via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SCHEME` (default: http)
-
- The protocol via which Confluence is accessed.
-
-* `CATALINA_CONNECTOR_SECURE` (default: false)
-
- Set 'true' if CATALINA_CONNECTOR_SCHEME is 'https'.
-
-## JVM configuration
-
-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
-
-Example:
-
- $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/confluence/cacerts -v confluenceVolume:/var/atlassian/application-data/confluence --name="confluence" -d -p 8090:8090 -p 8091:8091 epicmorg/confluence
-
-
-# Upgrade
-
-To upgrade to a more recent version of Confluence Server you can simply stop the `Confluence`
-container and start a new one based on a more recent image:
-
- $> docker stop confluence
- $> docker rm confluence
- $> docker run ... (see above)
-
-As your data is stored in the data volume directory on the host, it will still
-be available after the upgrade.
-
-_Note: Please make sure that you **don't** accidentally remove the `confluence`
-container and its volumes using the `-v` option._
-
-# Backup
-
-For evaluating Confluence you can use the built-in database that will store its files in the Confluence Server home directory. In that case it is sufficient to create a backup archive of the directory on the host that is used as a volume (`/data/your-confluence-home` in the example above).
-
-Confluence's [automatic backup](https://confluence.atlassian.com/display/DOC/Configuring+Backups) is currently supported in the Docker setup. You can also use the [Production Backup Strategy](https://confluence.atlassian.com/display/DOC/Production+Backup+Strategy) approach if you're using an external database.
-
-Read more about data recovery and backups: [Site Backup and Restore](https://confluence.atlassian.com/display/DOC/Site+Backup+and+Restore)
-
-# Versioning
-
-The `latest` tag matches the most recent release of Atlassian Confluence Server.
-So `epicmorg/confluence:latest` will use the newest stable version of Confluence Server available.
-
-Alternatively, you can use a specific minor version of Confluence Server by using a version number
-tag: `epicmorg/confluence:5.10.8`. This will install the latest `5.10.8` version that
-is available.
-
-## Versions available
-
-* `epicmorg/confluence:latest`
-* `epicmorg/confluence:5.6.4`
-* `epicmorg/confluence:5.10.8`
-
-# Known Problems
-In Mac OS X with Docker version 1.11.0, when running with docker-machine, there is a bug where the directory specified for `CONFLUENCE_HOME` in a volume mount will not have the correct permission, and thus startup fails with a permission denied error:
- Error writing state to confluence.cfg.xml
-com.atlassian.config.ConfigurationException: Couldn't save confluence.cfg.xml to /var/atlassian/confluence-home directory.
-
-See https://github.com/docker/docker/issues/4023 for details.
-
-To work around this issue, use a different host operating system other than Mac OSX until a newer release of Docker fixes this issue.
-
-# Support
-
-This Docker image is great for evaluating Confluence. However, it does not use an Oracle JDK due to licensing constraints. Instead, it uses OpenJDK which is not supported for running Confluence in production.
-
-To meet our supported platform requirements, you'll need to build your own image based on [Oracle JDK](https://github.com/oracle/docker-images/tree/master/OracleJDK). See [Update the Confluence Docker image to use Oracle JDK ](https://confluence.atlassian.com/display/CONFKB/Update+the+Confluence+Docker+image+to+use+Oracle+JDK) for more info.
-
-For product support go to [support.atlassian.com](http://support.atlassian.com).
-
diff --git a/linux/atlassian/confluence/6/6.7.0/Dockerfile b/linux/atlassian/confluence/6/6.7.0/Dockerfile
deleted file mode 100644
index 9dc91e223..000000000
--- a/linux/atlassian/confluence/6/6.7.0/Dockerfile
+++ /dev/null
@@ -1,46 +0,0 @@
-FROM epicmorg/prod:jdk8
-LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org"
-ARG DEBIAN_FRONTEND=noninteractive
-
-##################################################################
-# ARGuments
-##################################################################
-ARG CONFLUENCE_VERSION=6.7.0
-ARG DOWNLOAD_URL=http://www.atlassian.com/software/confluence/downloads/binary/atlassian-confluence-${CONFLUENCE_VERSION}.tar.gz
-
-##################################################################
-# Setup
-##################################################################
-ENV RUN_USER daemon
-ENV RUN_GROUP daemon
-
-# https://confluence.atlassian.com/doc/confluence-home-and-other-important-directories-590259707.html
-ENV CONFLUENCE_HOME /var/atlassian/application-data/confluence
-ENV CONFLUENCE_INSTALL_DIR /opt/atlassian/confluence
-
-VOLUME ["${CONFLUENCE_HOME}"]
-WORKDIR $CONFLUENCE_HOME
-
-# Expose HTTP and Synchrony ports
-EXPOSE 8090
-EXPOSE 8091
-
-##################################################################
-# Installing
-##################################################################
-RUN mkdir -p ${CONFLUENCE_INSTALL_DIR} \
- && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$CONFLUENCE_INSTALL_DIR" \
- && chown -R ${RUN_USER}:${RUN_GROUP} ${CONFLUENCE_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=\${CONFLUENCE_HOME}/g' ${CONFLUENCE_INSTALL_DIR}/bin/setenv.sh \
- && sed -i -e 's/port="8090"/port="8090" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${CONFLUENCE_INSTALL_DIR}/conf/server.xml && \
-
- update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \
- apt clean -y && \
- apt autoclean -y && \
- rm -rfv /var/lib/apt/lists/* && \
- rm -rfv /var/cache/apt/archives/*.deb
-
-CMD ["/entrypoint.sh", "-fg"]
-ENTRYPOINT ["/usr/bin/tini", "--"]
-COPY entrypoint.sh /entrypoint.sh
-COPY . /tmp
diff --git a/linux/atlassian/confluence/6/6.7.0/Makefile b/linux/atlassian/confluence/6/6.7.0/Makefile
deleted file mode 100644
index 23bfba3d1..000000000
--- a/linux/atlassian/confluence/6/6.7.0/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-all: confl
-
-confl:
- docker build --compress -t epicmorg/confluence:6.7.0 .
-
diff --git a/linux/atlassian/confluence/6/6.7.0/README.md b/linux/atlassian/confluence/6/6.7.0/README.md
deleted file mode 100644
index 7e5b92f37..000000000
--- a/linux/atlassian/confluence/6/6.7.0/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-Confluence Server is where you create, organise and discuss work with your team. Capture the knowledge that's too often lost in email inboxes and shared network drives in Confluence – where it's easy to find, use, and update. Give every team, project, or department its own space to create the things they need, whether it's meeting notes, product requirements, file lists, or project plans, you can get more done in Confluence.
-
-Learn more about Confluence Server:
-
-You can find the repository for this Dockerfile at