diff --git a/.travis.yml b/.travis.yml index c6f7a3a2a..f6b920434 100644 --- a/.travis.yml +++ b/.travis.yml @@ -739,6 +739,12 @@ matrix: - docker build --compress -t epicmorg/jira:8.5.2 atlassian/jira/8.5.2 - docker push epicmorg/jira:8.5.2 + - name: Jira 8.5.3 + script: + - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + - docker build --compress -t epicmorg/jira:8.5.3 atlassian/jira/8.5.3 + - docker push epicmorg/jira:8.5.3 + ######################################### #### Our minor priority images ######################################### diff --git a/CHANGELOG.md b/CHANGELOG.md index 607ce3ccb..aa395df6b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,11 @@ ## Changelog +* 01/13/2020 + * separated `base` images to `prod`, `prod:jdk8`, `prod:jdk11`, `devel`, `devel:jdk8`, `devel:jdk11` + * teamcity - `devel:jdk11` + * updated current atlassian contaners: + * `bitbucket` all current versions (`6.2`-`latest`) - `prod:jdk11`, + * `confluence` before `7.1` - `prod:jdk8`, after - `7.1` - `prod:jdk11`, + * `jira` before `8.2` - `prod:jdk8`, after - `8.2` - `prod:jdk11` * 12/13/2019 * updated `teamcity agent`. added `php 7.3` support. * fixed `nginx` image. diff --git a/atlassian/bitbucket/6.2.0/Dockerfile b/atlassian/bitbucket/6.2.0/Dockerfile index 2385b1817..b54e88165 100644 --- a/atlassian/bitbucket/6.2.0/Dockerfile +++ b/atlassian/bitbucket/6.2.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/6.2.1/Dockerfile b/atlassian/bitbucket/6.2.1/Dockerfile index 3dfeebc81..e75ca5e43 100644 --- a/atlassian/bitbucket/6.2.1/Dockerfile +++ b/atlassian/bitbucket/6.2.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/6.3.0/Dockerfile b/atlassian/bitbucket/6.3.0/Dockerfile index 9cf5555d3..8f9acef31 100644 --- a/atlassian/bitbucket/6.3.0/Dockerfile +++ b/atlassian/bitbucket/6.3.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/6.3.1/Dockerfile b/atlassian/bitbucket/6.3.1/Dockerfile index 0f8a5e6a0..346601dd1 100644 --- a/atlassian/bitbucket/6.3.1/Dockerfile +++ b/atlassian/bitbucket/6.3.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/6.3.2/Dockerfile b/atlassian/bitbucket/6.3.2/Dockerfile index 7e5d8b860..7b26a0df2 100644 --- a/atlassian/bitbucket/6.3.2/Dockerfile +++ b/atlassian/bitbucket/6.3.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/6.4.0/Dockerfile b/atlassian/bitbucket/6.4.0/Dockerfile index 485bb4df3..1e0821e46 100644 --- a/atlassian/bitbucket/6.4.0/Dockerfile +++ b/atlassian/bitbucket/6.4.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/6.4.1/Dockerfile b/atlassian/bitbucket/6.4.1/Dockerfile index a5f00aa66..6b25e0704 100644 --- a/atlassian/bitbucket/6.4.1/Dockerfile +++ b/atlassian/bitbucket/6.4.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/6.5.0/Dockerfile b/atlassian/bitbucket/6.5.0/Dockerfile index a08d739f6..75c4d0dc3 100644 --- a/atlassian/bitbucket/6.5.0/Dockerfile +++ b/atlassian/bitbucket/6.5.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/6.5.1/Dockerfile b/atlassian/bitbucket/6.5.1/Dockerfile index 431ecac8f..93a21cf28 100644 --- a/atlassian/bitbucket/6.5.1/Dockerfile +++ b/atlassian/bitbucket/6.5.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/6.5.2/Dockerfile b/atlassian/bitbucket/6.5.2/Dockerfile index b6de3f791..3b08acf93 100644 --- a/atlassian/bitbucket/6.5.2/Dockerfile +++ b/atlassian/bitbucket/6.5.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/6.6.0/Dockerfile b/atlassian/bitbucket/6.6.0/Dockerfile index 0a67b6735..599124d29 100644 --- a/atlassian/bitbucket/6.6.0/Dockerfile +++ b/atlassian/bitbucket/6.6.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/6.6.1/Dockerfile b/atlassian/bitbucket/6.6.1/Dockerfile index 875adfb1a..c459bc9a4 100644 --- a/atlassian/bitbucket/6.6.1/Dockerfile +++ b/atlassian/bitbucket/6.6.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/6.6.2/Dockerfile b/atlassian/bitbucket/6.6.2/Dockerfile index 5a5afe54e..e0db4fc35 100644 --- a/atlassian/bitbucket/6.6.2/Dockerfile +++ b/atlassian/bitbucket/6.6.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/6.7.0/Dockerfile b/atlassian/bitbucket/6.7.0/Dockerfile index 839f08193..7e422c1eb 100644 --- a/atlassian/bitbucket/6.7.0/Dockerfile +++ b/atlassian/bitbucket/6.7.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/6.7.1/Dockerfile b/atlassian/bitbucket/6.7.1/Dockerfile index a8ac5dce3..cd2d58f0b 100644 --- a/atlassian/bitbucket/6.7.1/Dockerfile +++ b/atlassian/bitbucket/6.7.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/6.7.2/Dockerfile b/atlassian/bitbucket/6.7.2/Dockerfile index bc757a64d..eb4e08c46 100644 --- a/atlassian/bitbucket/6.7.2/Dockerfile +++ b/atlassian/bitbucket/6.7.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/6.8.0/Dockerfile b/atlassian/bitbucket/6.8.0/Dockerfile index a0ea7cffd..2106400bf 100644 --- a/atlassian/bitbucket/6.8.0/Dockerfile +++ b/atlassian/bitbucket/6.8.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/6.8.1/Dockerfile b/atlassian/bitbucket/6.8.1/Dockerfile index ab68fe188..239ce3eaa 100644 --- a/atlassian/bitbucket/6.8.1/Dockerfile +++ b/atlassian/bitbucket/6.8.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/bitbucket/latest/Dockerfile b/atlassian/bitbucket/latest/Dockerfile index ab68fe188..239ce3eaa 100644 --- a/atlassian/bitbucket/latest/Dockerfile +++ b/atlassian/bitbucket/latest/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.10.0/Dockerfile b/atlassian/confluence/6.10.0/Dockerfile index f1afe7678..4ad1fde3c 100644 --- a/atlassian/confluence/6.10.0/Dockerfile +++ b/atlassian/confluence/6.10.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.10.1/Dockerfile b/atlassian/confluence/6.10.1/Dockerfile index bbb6fc614..03804167e 100644 --- a/atlassian/confluence/6.10.1/Dockerfile +++ b/atlassian/confluence/6.10.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.10.2/Dockerfile b/atlassian/confluence/6.10.2/Dockerfile index 862582038..b7a0eabd0 100644 --- a/atlassian/confluence/6.10.2/Dockerfile +++ b/atlassian/confluence/6.10.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.11.0/Dockerfile b/atlassian/confluence/6.11.0/Dockerfile index efd2d7f92..a398499dc 100644 --- a/atlassian/confluence/6.11.0/Dockerfile +++ b/atlassian/confluence/6.11.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.11.1/Dockerfile b/atlassian/confluence/6.11.1/Dockerfile index 4e3a61d01..b9f04c9fa 100644 --- a/atlassian/confluence/6.11.1/Dockerfile +++ b/atlassian/confluence/6.11.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.11.2/Dockerfile b/atlassian/confluence/6.11.2/Dockerfile index a5dd1630f..68b11e92e 100644 --- a/atlassian/confluence/6.11.2/Dockerfile +++ b/atlassian/confluence/6.11.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.12.0/Dockerfile b/atlassian/confluence/6.12.0/Dockerfile index 515716af1..1dc6fad00 100644 --- a/atlassian/confluence/6.12.0/Dockerfile +++ b/atlassian/confluence/6.12.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.12.1/Dockerfile b/atlassian/confluence/6.12.1/Dockerfile index 91f5ca282..4bbf92616 100644 --- a/atlassian/confluence/6.12.1/Dockerfile +++ b/atlassian/confluence/6.12.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.12.2/Dockerfile b/atlassian/confluence/6.12.2/Dockerfile index a6f0f0c74..5371f2910 100644 --- a/atlassian/confluence/6.12.2/Dockerfile +++ b/atlassian/confluence/6.12.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.12.3/Dockerfile b/atlassian/confluence/6.12.3/Dockerfile index 3b234f8ea..754b5b423 100644 --- a/atlassian/confluence/6.12.3/Dockerfile +++ b/atlassian/confluence/6.12.3/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.12.4/Dockerfile b/atlassian/confluence/6.12.4/Dockerfile index 441d82a50..e19663666 100644 --- a/atlassian/confluence/6.12.4/Dockerfile +++ b/atlassian/confluence/6.12.4/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.13.0/Dockerfile b/atlassian/confluence/6.13.0/Dockerfile index b1a41e1d1..ccb8e85b9 100644 --- a/atlassian/confluence/6.13.0/Dockerfile +++ b/atlassian/confluence/6.13.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.13.1/Dockerfile b/atlassian/confluence/6.13.1/Dockerfile index bd4df3634..d443befb1 100644 --- a/atlassian/confluence/6.13.1/Dockerfile +++ b/atlassian/confluence/6.13.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.13.2/Dockerfile b/atlassian/confluence/6.13.2/Dockerfile index 491fc3627..d70d32f7e 100644 --- a/atlassian/confluence/6.13.2/Dockerfile +++ b/atlassian/confluence/6.13.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.13.3/Dockerfile b/atlassian/confluence/6.13.3/Dockerfile index cbd126655..9b3339a01 100644 --- a/atlassian/confluence/6.13.3/Dockerfile +++ b/atlassian/confluence/6.13.3/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.13.4/Dockerfile b/atlassian/confluence/6.13.4/Dockerfile index af9c8b332..754b6e94f 100644 --- a/atlassian/confluence/6.13.4/Dockerfile +++ b/atlassian/confluence/6.13.4/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.14.0/Dockerfile b/atlassian/confluence/6.14.0/Dockerfile index 7c9be0bab..75528b59f 100644 --- a/atlassian/confluence/6.14.0/Dockerfile +++ b/atlassian/confluence/6.14.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.14.1/Dockerfile b/atlassian/confluence/6.14.1/Dockerfile index e5de2f9fc..1afce19ac 100644 --- a/atlassian/confluence/6.14.1/Dockerfile +++ b/atlassian/confluence/6.14.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.14.2/Dockerfile b/atlassian/confluence/6.14.2/Dockerfile index 196c67177..9c09f9aa0 100644 --- a/atlassian/confluence/6.14.2/Dockerfile +++ b/atlassian/confluence/6.14.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.14.3/Dockerfile b/atlassian/confluence/6.14.3/Dockerfile index 9a6b58967..09045771f 100644 --- a/atlassian/confluence/6.14.3/Dockerfile +++ b/atlassian/confluence/6.14.3/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.15.1/Dockerfile b/atlassian/confluence/6.15.1/Dockerfile index 2fa5c0ff3..b4760d22a 100644 --- a/atlassian/confluence/6.15.1/Dockerfile +++ b/atlassian/confluence/6.15.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.15.2/Dockerfile b/atlassian/confluence/6.15.2/Dockerfile index 4c9d5f4f3..8f3f731e4 100644 --- a/atlassian/confluence/6.15.2/Dockerfile +++ b/atlassian/confluence/6.15.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.15.4/Dockerfile b/atlassian/confluence/6.15.4/Dockerfile index 8448b9c83..bd22b9524 100644 --- a/atlassian/confluence/6.15.4/Dockerfile +++ b/atlassian/confluence/6.15.4/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.15.6/Dockerfile b/atlassian/confluence/6.15.6/Dockerfile index c59edf6ee..7ded10ca3 100644 --- a/atlassian/confluence/6.15.6/Dockerfile +++ b/atlassian/confluence/6.15.6/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.15.7/Dockerfile b/atlassian/confluence/6.15.7/Dockerfile index 96f818204..fd475818d 100644 --- a/atlassian/confluence/6.15.7/Dockerfile +++ b/atlassian/confluence/6.15.7/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.15.8/Dockerfile b/atlassian/confluence/6.15.8/Dockerfile index 2d0e14cf5..88eb7769b 100644 --- a/atlassian/confluence/6.15.8/Dockerfile +++ b/atlassian/confluence/6.15.8/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.15.9/Dockerfile b/atlassian/confluence/6.15.9/Dockerfile index d2fa2a124..d3ce10616 100644 --- a/atlassian/confluence/6.15.9/Dockerfile +++ b/atlassian/confluence/6.15.9/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.9.0/Dockerfile b/atlassian/confluence/6.9.0/Dockerfile index d44e917af..e31383c10 100644 --- a/atlassian/confluence/6.9.0/Dockerfile +++ b/atlassian/confluence/6.9.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.9.1/Dockerfile b/atlassian/confluence/6.9.1/Dockerfile index 34d709a12..f5b01ef4a 100644 --- a/atlassian/confluence/6.9.1/Dockerfile +++ b/atlassian/confluence/6.9.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/6.9.3/Dockerfile b/atlassian/confluence/6.9.3/Dockerfile index 5d5f9043c..e5540d33d 100644 --- a/atlassian/confluence/6.9.3/Dockerfile +++ b/atlassian/confluence/6.9.3/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/7.0.1/Dockerfile b/atlassian/confluence/7.0.1/Dockerfile index 1ad4df6f9..b1790ded0 100644 --- a/atlassian/confluence/7.0.1/Dockerfile +++ b/atlassian/confluence/7.0.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/7.0.2/Dockerfile b/atlassian/confluence/7.0.2/Dockerfile index 58e12a520..00313c49f 100644 --- a/atlassian/confluence/7.0.2/Dockerfile +++ b/atlassian/confluence/7.0.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/7.0.3/Dockerfile b/atlassian/confluence/7.0.3/Dockerfile index 748cf587b..7968f2513 100644 --- a/atlassian/confluence/7.0.3/Dockerfile +++ b/atlassian/confluence/7.0.3/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/7.0.4/Dockerfile b/atlassian/confluence/7.0.4/Dockerfile index 321dcceba..8f6e2b2ca 100644 --- a/atlassian/confluence/7.0.4/Dockerfile +++ b/atlassian/confluence/7.0.4/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/7.1.0/Dockerfile b/atlassian/confluence/7.1.0/Dockerfile index 57114034d..66b1b2b9a 100644 --- a/atlassian/confluence/7.1.0/Dockerfile +++ b/atlassian/confluence/7.1.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/7.1.1/Dockerfile b/atlassian/confluence/7.1.1/Dockerfile index b3d10ee44..3cc9ae29e 100644 --- a/atlassian/confluence/7.1.1/Dockerfile +++ b/atlassian/confluence/7.1.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/7.1.2/Dockerfile b/atlassian/confluence/7.1.2/Dockerfile index 4c9103bec..d8dd674c6 100644 --- a/atlassian/confluence/7.1.2/Dockerfile +++ b/atlassian/confluence/7.1.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/7.2.0/Dockerfile b/atlassian/confluence/7.2.0/Dockerfile index 92ee98e39..4f7c7881c 100644 --- a/atlassian/confluence/7.2.0/Dockerfile +++ b/atlassian/confluence/7.2.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/confluence/latest/Dockerfile b/atlassian/confluence/latest/Dockerfile index 92ee98e39..4f7c7881c 100644 --- a/atlassian/confluence/latest/Dockerfile +++ b/atlassian/confluence/latest/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.10.0/Dockerfile b/atlassian/jira/7.10.0/Dockerfile index e4e2462db..a0f302de7 100644 --- a/atlassian/jira/7.10.0/Dockerfile +++ b/atlassian/jira/7.10.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.10.1/Dockerfile b/atlassian/jira/7.10.1/Dockerfile index f8c4d4fdb..6e545a8a8 100644 --- a/atlassian/jira/7.10.1/Dockerfile +++ b/atlassian/jira/7.10.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.10.2/Dockerfile b/atlassian/jira/7.10.2/Dockerfile index 6c037dd43..5a0561f1c 100644 --- a/atlassian/jira/7.10.2/Dockerfile +++ b/atlassian/jira/7.10.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.11.0/Dockerfile b/atlassian/jira/7.11.0/Dockerfile index fab5e9d1d..a2195559b 100644 --- a/atlassian/jira/7.11.0/Dockerfile +++ b/atlassian/jira/7.11.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.11.1/Dockerfile b/atlassian/jira/7.11.1/Dockerfile index ef7c5c15a..ea24c559d 100644 --- a/atlassian/jira/7.11.1/Dockerfile +++ b/atlassian/jira/7.11.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.11.2/Dockerfile b/atlassian/jira/7.11.2/Dockerfile index 13a6e815d..a4a924426 100644 --- a/atlassian/jira/7.11.2/Dockerfile +++ b/atlassian/jira/7.11.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.12.0/Dockerfile b/atlassian/jira/7.12.0/Dockerfile index 3d2d47236..2befbc48f 100644 --- a/atlassian/jira/7.12.0/Dockerfile +++ b/atlassian/jira/7.12.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.12.1/Dockerfile b/atlassian/jira/7.12.1/Dockerfile index d1af4db50..cbe320063 100644 --- a/atlassian/jira/7.12.1/Dockerfile +++ b/atlassian/jira/7.12.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.12.3/Dockerfile b/atlassian/jira/7.12.3/Dockerfile index f7e620d2a..ff5c9a997 100644 --- a/atlassian/jira/7.12.3/Dockerfile +++ b/atlassian/jira/7.12.3/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.13.0/Dockerfile b/atlassian/jira/7.13.0/Dockerfile index b4f8dae33..32d673841 100644 --- a/atlassian/jira/7.13.0/Dockerfile +++ b/atlassian/jira/7.13.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.13.1/Dockerfile b/atlassian/jira/7.13.1/Dockerfile index 639ed8f15..4f1c76cb7 100644 --- a/atlassian/jira/7.13.1/Dockerfile +++ b/atlassian/jira/7.13.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.13.11/Dockerfile b/atlassian/jira/7.13.11/Dockerfile index 6f3700465..6a1bbc847 100644 --- a/atlassian/jira/7.13.11/Dockerfile +++ b/atlassian/jira/7.13.11/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.13.2/Dockerfile b/atlassian/jira/7.13.2/Dockerfile index 1ba2cf444..61675251c 100644 --- a/atlassian/jira/7.13.2/Dockerfile +++ b/atlassian/jira/7.13.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.13.3/Dockerfile b/atlassian/jira/7.13.3/Dockerfile index e1713ba96..3bb690fbe 100644 --- a/atlassian/jira/7.13.3/Dockerfile +++ b/atlassian/jira/7.13.3/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.13.4/Dockerfile b/atlassian/jira/7.13.4/Dockerfile index c3e26ca71..7990267e9 100644 --- a/atlassian/jira/7.13.4/Dockerfile +++ b/atlassian/jira/7.13.4/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.13.5/Dockerfile b/atlassian/jira/7.13.5/Dockerfile index a5969cbb3..9dc0928e3 100644 --- a/atlassian/jira/7.13.5/Dockerfile +++ b/atlassian/jira/7.13.5/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.13.6/Dockerfile b/atlassian/jira/7.13.6/Dockerfile index 6c9a21d12..dfd1d9712 100644 --- a/atlassian/jira/7.13.6/Dockerfile +++ b/atlassian/jira/7.13.6/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.13.8/Dockerfile b/atlassian/jira/7.13.8/Dockerfile index 67615efae..e19343579 100644 --- a/atlassian/jira/7.13.8/Dockerfile +++ b/atlassian/jira/7.13.8/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/7.13.9/Dockerfile b/atlassian/jira/7.13.9/Dockerfile index f5ccc7ff9..3efaa8d12 100644 --- a/atlassian/jira/7.13.9/Dockerfile +++ b/atlassian/jira/7.13.9/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.0.0/Dockerfile b/atlassian/jira/8.0.0/Dockerfile index d27424007..98e94c6bc 100644 --- a/atlassian/jira/8.0.0/Dockerfile +++ b/atlassian/jira/8.0.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.0.2/Dockerfile b/atlassian/jira/8.0.2/Dockerfile index ccf2e5dc7..b4346797e 100644 --- a/atlassian/jira/8.0.2/Dockerfile +++ b/atlassian/jira/8.0.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.1.0/Dockerfile b/atlassian/jira/8.1.0/Dockerfile index 2047eff12..60a5c20be 100644 --- a/atlassian/jira/8.1.0/Dockerfile +++ b/atlassian/jira/8.1.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.1.1/Dockerfile b/atlassian/jira/8.1.1/Dockerfile index fdd46c369..3cbd9cb52 100644 --- a/atlassian/jira/8.1.1/Dockerfile +++ b/atlassian/jira/8.1.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk8 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.2.0/Dockerfile b/atlassian/jira/8.2.0/Dockerfile index b84ca55ed..6bab33843 100644 --- a/atlassian/jira/8.2.0/Dockerfile +++ b/atlassian/jira/8.2.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.2.1/Dockerfile b/atlassian/jira/8.2.1/Dockerfile index 00333e88e..f1dc5bd51 100644 --- a/atlassian/jira/8.2.1/Dockerfile +++ b/atlassian/jira/8.2.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.2.2/Dockerfile b/atlassian/jira/8.2.2/Dockerfile index 5c7592240..eb09f592e 100644 --- a/atlassian/jira/8.2.2/Dockerfile +++ b/atlassian/jira/8.2.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.2.3/Dockerfile b/atlassian/jira/8.2.3/Dockerfile index a9ab8ca00..5d85db334 100644 --- a/atlassian/jira/8.2.3/Dockerfile +++ b/atlassian/jira/8.2.3/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.2.4/Dockerfile b/atlassian/jira/8.2.4/Dockerfile index b61a60efe..fe86295f7 100644 --- a/atlassian/jira/8.2.4/Dockerfile +++ b/atlassian/jira/8.2.4/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.3.0/Dockerfile b/atlassian/jira/8.3.0/Dockerfile index 5f8fd7d2d..510cccac8 100644 --- a/atlassian/jira/8.3.0/Dockerfile +++ b/atlassian/jira/8.3.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.3.1/Dockerfile b/atlassian/jira/8.3.1/Dockerfile index 88ad71412..ba2aaf577 100644 --- a/atlassian/jira/8.3.1/Dockerfile +++ b/atlassian/jira/8.3.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.3.2/Dockerfile b/atlassian/jira/8.3.2/Dockerfile index 5d4fed2e9..23d3e6fd8 100644 --- a/atlassian/jira/8.3.2/Dockerfile +++ b/atlassian/jira/8.3.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.3.3/Dockerfile b/atlassian/jira/8.3.3/Dockerfile index 6c96077ce..2ad7f24b0 100644 --- a/atlassian/jira/8.3.3/Dockerfile +++ b/atlassian/jira/8.3.3/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.3.4/Dockerfile b/atlassian/jira/8.3.4/Dockerfile index 4025a2fc7..cb9199c1e 100644 --- a/atlassian/jira/8.3.4/Dockerfile +++ b/atlassian/jira/8.3.4/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.4.0/Dockerfile b/atlassian/jira/8.4.0/Dockerfile index ed0f03a4a..575fdcbd3 100644 --- a/atlassian/jira/8.4.0/Dockerfile +++ b/atlassian/jira/8.4.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.4.1/Dockerfile b/atlassian/jira/8.4.1/Dockerfile index 650596e00..a0be846db 100644 --- a/atlassian/jira/8.4.1/Dockerfile +++ b/atlassian/jira/8.4.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.4.2/Dockerfile b/atlassian/jira/8.4.2/Dockerfile index 24084a676..b39613392 100644 --- a/atlassian/jira/8.4.2/Dockerfile +++ b/atlassian/jira/8.4.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.5.0/Dockerfile b/atlassian/jira/8.5.0/Dockerfile index 3bf06b375..f43659f70 100644 --- a/atlassian/jira/8.5.0/Dockerfile +++ b/atlassian/jira/8.5.0/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.5.1/Dockerfile b/atlassian/jira/8.5.1/Dockerfile index 06753de1a..c03ba4349 100644 --- a/atlassian/jira/8.5.1/Dockerfile +++ b/atlassian/jira/8.5.1/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.5.2/Dockerfile b/atlassian/jira/8.5.2/Dockerfile index b0f6a23eb..b58a1df0f 100644 --- a/atlassian/jira/8.5.2/Dockerfile +++ b/atlassian/jira/8.5.2/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive diff --git a/atlassian/jira/8.5.3/.docker-repository.yml b/atlassian/jira/8.5.3/.docker-repository.yml new file mode 100644 index 000000000..8dc515604 --- /dev/null +++ b/atlassian/jira/8.5.3/.docker-repository.yml @@ -0,0 +1 @@ +repository: epicmorg/jira diff --git a/atlassian/jira/8.5.3/.dockerignore b/atlassian/jira/8.5.3/.dockerignore new file mode 100644 index 000000000..99176b278 --- /dev/null +++ b/atlassian/jira/8.5.3/.dockerignore @@ -0,0 +1,3 @@ +.git +scripts +.idea \ No newline at end of file diff --git a/atlassian/jira/8.5.3/Dockerfile b/atlassian/jira/8.5.3/Dockerfile new file mode 100644 index 000000000..30bc99420 --- /dev/null +++ b/atlassian/jira/8.5.3/Dockerfile @@ -0,0 +1,47 @@ +FROM epicmorg/prod:jdk11 +LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" +ARG DEBIAN_FRONTEND=noninteractive + +################################################################## +# ARGuments +################################################################## +ARG JIRA_VERSION=8.5.3 +ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${JIRA_VERSION}.tar.gz + +################################################################## +# Setup +################################################################## +ENV RUN_USER daemon +ENV RUN_GROUP daemon + +# https://confluence.atlassian.com/display/JSERVERM/Important+directories+and+files +ENV JIRA_HOME /var/atlassian/application-data/jira +ENV JIRA_INSTALL_DIR /opt/atlassian/jira + +VOLUME ["${JIRA_HOME}"] +WORKDIR $JIRA_HOME + +# Expose HTTP port +EXPOSE 8080 + +################################################################## +# Installing +################################################################## +RUN mkdir -p ${JIRA_INSTALL_DIR} \ + && curl -L ${DOWNLOAD_URL} | tar -xz --strip-components=1 -C "$JIRA_INSTALL_DIR" \ + && chown -R ${RUN_USER}:${RUN_GROUP} ${JIRA_INSTALL_DIR}/ \ + && sed -i -e 's/^JVM_SUPPORT_RECOMMENDED_ARGS=""$/: \${JVM_SUPPORT_RECOMMENDED_ARGS:=""}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ + && sed -i -e 's/^JVM_\(.*\)_MEMORY="\(.*\)"$/: \${JVM_\1_MEMORY:=\2}/g' ${JIRA_INSTALL_DIR}/bin/setenv.sh \ + && sed -i -e 's/grep "java version"/grep -E "(openjdk|java) version"/g' ${JIRA_INSTALL_DIR}/bin/check-java.sh \ + && sed -i -e 's/port="8080"/port="8080" secure="${catalinaConnectorSecure}" scheme="${catalinaConnectorScheme}" proxyName="${catalinaConnectorProxyName}" proxyPort="${catalinaConnectorProxyPort}"/' ${JIRA_INSTALL_DIR}/conf/server.xml && \ + + update-locale LC_ALL=en_US.UTF-8 LANG=en_US.UTF-8 && \ + apt clean -y && \ + apt autoclean -y && \ + 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/atlassian/jira/8.5.3/Makefile b/atlassian/jira/8.5.3/Makefile new file mode 100644 index 000000000..431d0ee96 --- /dev/null +++ b/atlassian/jira/8.5.3/Makefile @@ -0,0 +1,4 @@ +all: jr + +jr: + docker build --compress -t epicmorg/jira:8.5.3 . diff --git a/atlassian/jira/8.5.3/README.md b/atlassian/jira/8.5.3/README.md new file mode 100644 index 000000000..4cab96ead --- /dev/null +++ b/atlassian/jira/8.5.3/README.md @@ -0,0 +1,151 @@ +![Atlassian JIRA](https://www.atlassian.com/dam/wac/legacy/jira_logo_landing.png) + +JIRA Software is a software development tool used by agile teams. + +Learn more about JIRA Software: + +# Overview + +This Docker container makes it easy to get an instance of JIRA Software up and running. + +# Quick Start + +For the `JIRA_HOME` directory that is used to store application data (amongst other things) we recommend mounting a host directory as a [data volume](https://docs.docker.com/engine/tutorials/dockervolumes/#/data-volumes), or via a named volume if using a docker version >= 1.9. + +To get started you can use a data volume, or named volumes. In this example we'll use named volumes. + + $> docker volume create --name jiraVolume + $> docker run -v jiraVolume:/var/atlassian/application-data/jira --name="jira" -d -p 8080:8080 epicmorg/jira + + +**Success**. JIRA is now available on [http://localhost:8080](http://localhost:8080)* + +Please ensure your container has the necessary resources allocated to it. We recommend 2GiB of memory allocated to accommodate the application server. See [System Requirements](https://confluence.atlassian.com/adminjiraserver071/jira-applications-installation-requirements-802592164.html) for further information. + + +_* Note: If you are using `docker-machine` on Mac OS X, please use `open http://$(docker-machine ip default):8080` instead._ + +## Memory / Heap Size + +If you need to override JIRA's default memory allocation, you can control the minimum heap (Xms) and maximum heap (Xmx) via the below environment variables. + +* `JVM_MINIMUM_MEMORY` (default: 384m) + + The minimum heap size of the JVM + +* `JVM_MAXIMUM_MEMORY` (default: 768m) + + The maximum heap size of the JVM + +## Reverse Proxy Settings + +If JIRA is run behind a reverse proxy server as [described here](https://confluence.atlassian.com/adminjiraserver072/integrating-jira-with-apache-using-ssl-828788158.html), then you need to specify extra options to make JIRA 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 JIRA is accessed. + +* `CATALINA_CONNECTOR_SCHEME` (default: http) + + The protocol via which JIRA 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 JIRA, such as specifying a custom trust store, you can add them via the below environment variable + +* `JVM_SUPPORT_RECOMMENDED_ARGS` + + Additional JVM arguments for JIRA + +Example: + + $> docker run -e JVM_SUPPORT_RECOMMENDED_ARGS=-Djavax.net.ssl.trustStore=/var/atlassian/application-data/jira/cacerts -v jiraVolume:/var/atlassian/application-data/jira --name="jira" -d -p 8080:8080 epicmorg/jira + +## Data Center configuration + +This docker image can be run as part of a [Data Center](https://confluence.atlassian.com/enterprise/jira-data-center-472219731.html) cluster. You can specify the following properties to start Jira as a Data Center node, instead of manually configuring a cluster.properties file, See [Installing Jira Data Center](https://confluence.atlassian.com/adminjiraserver071/installing-jira-data-center-802592197.html) for more information on each property and its possible configuration. + +* `CLUSTERED` (default: false) + + Set 'true' to enable clustering configuration to be used. This will create a **cluster.properties** file inside the container's `$JIRA_HOME` directory. + +* `JIRA_NODE_ID` (default: jira_node_) + + The unique ID for the node. By default, this will include the first eight characters of the Docker container ID, but can be overridden with a custom value. + +* `JIRA_SHARED_HOME` (default: $JIRA_HOME/shared) + + The location of the shared home directory for all Jira nodes. + +* `EHCACHE_PEER_DISCOVERY` (default: default) + + Describes how nodes find each other. + +* `EHCACHE_LISTENER_HOSTNAME` (default: NONE) + + The hostname of the current node for cache communication. Jira Data Center will resolve this this internally if the parameter isn't set. + +* `EHCACHE_LISTENER_PORT` (default: 40001) + + The port the node is going to be listening to. + +* `EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS` (default: 2000) + + The default timeout for the Ehcache listener. + +* `EHCACHE_MULTICAST_ADDRESS` (default: NONE) + + A valid multicast group address. Required when EHCACHE_PEER_DISCOVERY is set to 'automatic' insted of 'default'. + +* `EHCACHE_MULTICAST_PORT` (default: NONE) + + The dedicated port for the multicast heartbeat traffic.Required when EHCACHE_PEER_DISCOVERY is set to 'automatic' insted of 'default'. + +* `EHCACHE_MULTICAST_TIMETOLIVE` (default: NONE) + + A value between 0 and 255 which determines how far the packets will propagate. Required when EHCACHE_PEER_DISCOVERY is set to 'automatic' insted of 'default'. + +* `EHCACHE_MULTICAST_HOSTNAME` (default: NONE) + + The hostname or IP of the interface to be used for sending and receiving multicast packets. Required when EHCACHE_PEER_DISCOVERY is set to 'automatic' insted of 'default'. + +# Upgrade + +To upgrade to a more recent version of JIRA you can simply stop the `jira` container and start a new one based on a more recent image: + + $> docker stop jira + $> docker rm jira + $> 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 `jira` container and its volumes using the `-v` option._ + +# Backup + +For evaluations you can use the built-in database that will store its files in the JIRA home directory. In that case it is sufficient to create a backup archive of the docker volume. + +If you're using an external database, you can configure JIRA to make a backup automatically each night. This will back up the current state, including the database to the `jiraVolume` docker volume, which can then be archived. Alternatively you can backup the database separately, and continue to create a backup archive of the docker volume to back up the JIRA Home directory. + +Read more about data recovery and backups: [https://confluence.atlassian.com/adminjiraserver071/backing-up-data-802592964.html](https://confluence.atlassian.com/adminjiraserver071/backing-up-data-802592964.html) + +# Versioning + +The `latest` tag matches the most recent release of Atlassian JIRA Software. Thus `epicmorg/jira:latest` will use the newest version of JIRA available. + +## Versions available + +* `epicmorg/jira:latest` +* `epicmorg/jira:7.10.0` + +# Support + +This Docker container is unsupported and is intended for illustration purposes only. diff --git a/atlassian/jira/8.5.3/entrypoint.sh b/atlassian/jira/8.5.3/entrypoint.sh new file mode 100644 index 000000000..50ee4ecd1 --- /dev/null +++ b/atlassian/jira/8.5.3/entrypoint.sh @@ -0,0 +1,89 @@ +#!/bin/bash +set -euo pipefail + +export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:/bin/javac::") +export JRE_HOME="$JAVA_HOME/jre" +export JAVA_BINARY="$JRE_HOME/bin/java" +export JAVA_VERSION=$("$JAVA_BINARY" -version 2>&1 | awk -F '"' '/version/ {print $2}') + +# Setup Catalina Opts +: ${CATALINA_CONNECTOR_PROXYNAME:=} +: ${CATALINA_CONNECTOR_PROXYPORT:=} +: ${CATALINA_CONNECTOR_SCHEME:=http} +: ${CATALINA_CONNECTOR_SECURE:=false} + +: ${CATALINA_OPTS:=} + +: ${JAVA_OPTS:=} + +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyName=${CATALINA_CONNECTOR_PROXYNAME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorProxyPort=${CATALINA_CONNECTOR_PROXYPORT}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorScheme=${CATALINA_CONNECTOR_SCHEME}" +CATALINA_OPTS="${CATALINA_OPTS} -DcatalinaConnectorSecure=${CATALINA_CONNECTOR_SECURE}" + +export JAVA_OPTS="${JAVA_OPTS} ${CATALINA_OPTS}" + +# Setup Data Center configuration +if [ ! -f "/etc/container_id" ]; then + uuidgen > /etc/container_id +fi +CONTAINER_ID=$(cat /etc/container_id) +CONTAINER_SHORT_ID=${CONTAINER_ID::8} + +: ${CLUSTERED:=false} +: ${JIRA_NODE_ID:=jira_node_${CONTAINER_SHORT_ID}} +: ${JIRA_SHARED_HOME:=${JIRA_HOME}/shared} +: ${EHCACHE_PEER_DISCOVERY:=} +: ${EHCACHE_LISTENER_HOSTNAME:=} +: ${EHCACHE_LISTENER_PORT:=} +: ${EHCACHE_LISTENER_SOCKETTIMEOUTMILLIS:=} +: ${EHCACHE_MULTICAST_ADDRESS:=} +: ${EHCACHE_MULTICAST_PORT:=} +: ${EHCACHE_MULTICAST_TIMETOLIVE:=} +: ${EHCACHE_MULTICAST_HOSTNAME:=} + +# Cleanly set/unset values in cluster.properties +function set_cluster_property { + if [ -z $2 ]; then + if [ -f "${JIRA_HOME}/cluster.properties" ]; then + sed -i -e "/^${1}/d" "${JIRA_HOME}/cluster.properties" + fi + return + fi + if [ ! -f "${JIRA_HOME}/cluster.properties" ]; then + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + elif grep "^${1}" "${JIRA_HOME}/cluster.properties"; then + sed -i -e "s#^${1}=.*#${1}=${2}#g" "${JIRA_HOME}/cluster.properties" + else + echo "${1}=${2}" >> "${JIRA_HOME}/cluster.properties" + fi +} + +if [ "${CLUSTERED}" == "true" ]; then + set_cluster_property "jira.node.id" "${JIRA_NODE_ID}" + set_cluster_property "jira.shared.home" "${JIRA_SHARED_HOME}" + set_cluster_property "ehcache.peer.discovery" "${EHCACHE_PEER_DISCOVERY}" + set_cluster_property "ehcache.listener.hostName" "${EHCACHE_LISTENER_HOSTNAME}" + set_cluster_property "ehcache.listener.port" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.listener.socketTimeoutMillis" "${EHCACHE_LISTENER_PORT}" + set_cluster_property "ehcache.multicast.address" "${EHCACHE_MULTICAST_ADDRESS}" + set_cluster_property "ehcache.multicast.port" "${EHCACHE_MULTICAST_PORT}" + set_cluster_property "ehcache.multicast.timeToLive" "${EHCACHE_MULTICAST_TIMETOLIVE}" + set_cluster_property "ehcache.multicast.hostName" "${EHCACHE_MULTICAST_HOSTNAME}" +fi + + +# Start Jira as the correct user +if [ "${UID}" -eq 0 ]; then + echo "User is currently root. Will change directory ownership to ${RUN_USER}:${RUN_GROUP}, then downgrade permission to ${RUN_USER}" + PERMISSIONS_SIGNATURE=$(stat -c "%u:%U:%a" "${JIRA_HOME}") + EXPECTED_PERMISSIONS=$(id -u ${RUN_USER}):${RUN_USER}:700 + if [ "${PERMISSIONS_SIGNATURE}" != "${EXPECTED_PERMISSIONS}" ]; then + chmod -R 700 "${JIRA_HOME}" && + chown -R "${RUN_USER}:${RUN_GROUP}" "${JIRA_HOME}" + fi + # Now drop privileges + exec su -s /bin/bash "${RUN_USER}" -c "$JIRA_INSTALL_DIR/bin/start-jira.sh $@" +else + exec "$JIRA_INSTALL_DIR/bin/start-jira.sh" "$@" +fi diff --git a/atlassian/jira/README.md b/atlassian/jira/README.md index edb737cc1..c23895a07 100644 --- a/atlassian/jira/README.md +++ b/atlassian/jira/README.md @@ -4,5 +4,6 @@ All presented images avalible on our repo in docker hub. ## LTS releases: -* Latest version of Jira `7.13.3` +* Latest version of `Jira 8` branch is `8.5.3` +* Latest version of `Jira 7` branch is `7.13.3` diff --git a/atlassian/jira/latest/Dockerfile b/atlassian/jira/latest/Dockerfile index 06753de1a..c03ba4349 100644 --- a/atlassian/jira/latest/Dockerfile +++ b/atlassian/jira/latest/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/prod +FROM epicmorg/prod:jdk11 LABEL maintainer="Atlassian Jira Server Team; EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive