From 41e0372c169d5fdaaae8cd04eb61b4d1344c1f9d Mon Sep 17 00:00:00 2001
From: Wong Hoi Sing Edison <hswong3i@gmail.com>
Date: Wed, 15 Jan 2020 13:34:37 +0800
Subject: [PATCH 1/2] Since Python2.x, it is part of the core Python
 distribution

---
 .../etc/ansible/roles/localhost/molecule/default/prepare.yml  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/etc/ansible/roles/localhost/molecule/default/prepare.yml b/files/etc/ansible/roles/localhost/molecule/default/prepare.yml
index 5979b84..04552c8 100644
--- a/files/etc/ansible/roles/localhost/molecule/default/prepare.yml
+++ b/files/etc/ansible/roles/localhost/molecule/default/prepare.yml
@@ -33,10 +33,10 @@
         yum install -y ca-certificates curl python3 sudo
       ignore_errors: true
 
-    - name: suse | zypper install ca-certificates* curl python3 python3-xml sudo
+    - name: suse | zypper install ca-certificates* curl python3 sudo
       raw: |
         zypper -n --gpg-auto-import-keys refresh
-        zypper -n install -y ca-certificates* curl python3 python3-xml sudo
+        zypper -n install -y ca-certificates* curl python3 sudo
       ignore_errors: true
 
     - name: debian | apt-get install ca-certificates curl python3 sudo

From 1a04f8c67e830635300397035508520be0dcb8ba Mon Sep 17 00:00:00 2001
From: Wong Hoi Sing Edison <hswong3i@gmail.com>
Date: Wed, 15 Jan 2020 14:46:30 +0800
Subject: [PATCH 2/2] Replace `dumb-init` with `tini`, as like as `docker
 --init`

---
 CHANGELOG.md                                           | 10 +++++++++-
 Dockerfile                                             |  2 +-
 .../roles/localhost/ansible-role-requirements.yml      |  4 ++--
 .../roles/localhost/molecule/default/playbook.yml      |  2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0d6a01..9104aae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,17 @@
 # Docker Image Packaging for Atlassian Fisheye
 
-## 4.7.2-XalvistackY - TBC
+## 4.8.0-XalvistackY - TBC
 
 ### Major Changes
 
+## 4.8.0-3alvistack1 - 2020-01-15
+
+### Major Changes
+
+  - Replace `dumb-init` with `tini`, as like as `docker --init`
+  - Replace `java` with `openjdk`
+  - Include release specific vars and tasks
+
 ## 4.7.2-2alvistack3 - 2019-11-05
 
 ### Major Changes
diff --git a/Dockerfile b/Dockerfile
index bab6a1c..30d9347 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -42,7 +42,7 @@ WORKDIR $FISHEYE_HOME
 EXPOSE 8059
 EXPOSE 8060
 
-ENTRYPOINT [ "dumb-init", "--", "docker-entrypoint.sh" ]
+ENTRYPOINT [ "tini", "-g", "--", "docker-entrypoint.sh" ]
 CMD        [ "start.sh", "-fg" ]
 
 # Hotfix for en_US.utf8 locale
diff --git a/files/etc/ansible/roles/localhost/ansible-role-requirements.yml b/files/etc/ansible/roles/localhost/ansible-role-requirements.yml
index 6580b98..0ba24b4 100644
--- a/files/etc/ansible/roles/localhost/ansible-role-requirements.yml
+++ b/files/etc/ansible/roles/localhost/ansible-role-requirements.yml
@@ -29,8 +29,8 @@
 - name: ansible
   src: https://github.com/alvistack/ansible-role-ansible/archive/master.tar.gz
 
-- name: dumb-init
-  src: https://github.com/alvistack/ansible-role-dumb-init/archive/master.tar.gz
+- name: tini
+  src: https://github.com/alvistack/ansible-role-tini/archive/master.tar.gz
 
 - name: gosu
   src: https://github.com/alvistack/ansible-role-gosu/archive/master.tar.gz
diff --git a/files/etc/ansible/roles/localhost/molecule/default/playbook.yml b/files/etc/ansible/roles/localhost/molecule/default/playbook.yml
index 7ec79be..e15f76e 100644
--- a/files/etc/ansible/roles/localhost/molecule/default/playbook.yml
+++ b/files/etc/ansible/roles/localhost/molecule/default/playbook.yml
@@ -22,7 +22,7 @@
     - role: timezone
     - role: python
     - role: ansible
-    - role: dumb-init
+    - role: tini
     - role: gosu
 
 - hosts: all