Merge branch 'release/4.8.0-3alvistack1'

alvistack · Jan 15, 2020 · b84a393 · b84a393
2 parents 58654fd + 1a04f8c
commit b84a393
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -22,7 +22,7 @@
     - role: timezone
     - role: python
     - role: ansible
-    - role: dumb-init
+    - role: tini
     - role: gosu
 
 - hosts: all

diff --git 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