From 98fec6e9d936c83a191847bb1e10740127b14072 Mon Sep 17 00:00:00 2001
From: stam <stam@epicm.org>
Date: Wed, 19 May 2021 03:14:47 +0300
Subject: [PATCH] jira-latest fix

---
 linux/atlassian/jira/latest/.env               |  3 +++
 linux/atlassian/jira/latest/Dockerfile         |  7 +++++--
 linux/atlassian/jira/latest/Dockerfile.jdk11   |  7 +++++--
 linux/atlassian/jira/latest/Makefile           |  8 ++++----
 linux/atlassian/jira/latest/docker-compose.yml | 17 +++++++++++++++++
 5 files changed, 34 insertions(+), 8 deletions(-)
 create mode 100644 linux/atlassian/jira/latest/.env
 create mode 100644 linux/atlassian/jira/latest/docker-compose.yml

diff --git a/linux/atlassian/jira/latest/.env b/linux/atlassian/jira/latest/.env
new file mode 100644
index 000000000..a127c6f7b
--- /dev/null
+++ b/linux/atlassian/jira/latest/.env
@@ -0,0 +1,3 @@
+
+RELEASE=8.17.0
+DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-8.17.0.tar.gz
diff --git a/linux/atlassian/jira/latest/Dockerfile b/linux/atlassian/jira/latest/Dockerfile
index b856a7fb9..eeec7c1d8 100644
--- a/linux/atlassian/jira/latest/Dockerfile
+++ b/linux/atlassian/jira/latest/Dockerfile
@@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive
 ##################################################################
 #                   ARGuments
 ##################################################################
-ARG JIRA_VERSION=8.17.0
-ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${JIRA_VERSION}.tar.gz
+
+#configured by dockerfile / .ENV
+ARG RELEASE
+ARG DOWNLOAD_URL
+
 
 ##################################################################
 #                   Setup
diff --git a/linux/atlassian/jira/latest/Dockerfile.jdk11 b/linux/atlassian/jira/latest/Dockerfile.jdk11
index d85b2120b..a98a20e49 100644
--- a/linux/atlassian/jira/latest/Dockerfile.jdk11
+++ b/linux/atlassian/jira/latest/Dockerfile.jdk11
@@ -5,8 +5,11 @@ ARG DEBIAN_FRONTEND=noninteractive
 ##################################################################
 #                   ARGuments
 ##################################################################
-ARG JIRA_VERSION=8.17.0
-ARG DOWNLOAD_URL=https://www.atlassian.com/software/jira/downloads/binary/atlassian-jira-software-${JIRA_VERSION}.tar.gz
+
+#configured by dockerfile / .ENV
+ARG RELEASE
+ARG DOWNLOAD_URL
+
 
 ##################################################################
 #                   Setup
diff --git a/linux/atlassian/jira/latest/Makefile b/linux/atlassian/jira/latest/Makefile
index 85c8a1f2c..82c5a2de6 100644
--- a/linux/atlassian/jira/latest/Makefile
+++ b/linux/atlassian/jira/latest/Makefile
@@ -1,5 +1,5 @@
-all: jr
+all: app
 
-jr:
-	docker build --compress -t epicmorg/jira .
-	docker push epicmorg/jira
\ No newline at end of file
+app:
+	docker-compose build --compress
+	docker-compose push
diff --git a/linux/atlassian/jira/latest/docker-compose.yml b/linux/atlassian/jira/latest/docker-compose.yml
new file mode 100644
index 000000000..89548e5ac
--- /dev/null
+++ b/linux/atlassian/jira/latest/docker-compose.yml
@@ -0,0 +1,17 @@
+version: '3.9'
+services:
+  app:
+    image: "epicmorg/jira:latest"
+    build:
+      context: .
+      args:
+        RELEASE: ${RELEASE}
+        DOWNLOAD_URL: ${DOWNLOAD_URL}
+  app-jdk11:
+    image: "epicmorg/jira:latest-jdk11"
+    build:
+      context: .
+      dockerfile: Dockerfile.jdk11
+      args:
+        RELEASE: ${RELEASE}
+        DOWNLOAD_URL: ${DOWNLOAD_URL}
\ No newline at end of file