Merge branch 'release/15.1-3alvistack1'

alvistack · Jan 15, 2020 · fe4c2be · fe4c2be
2 parents cadd5c2 + 325d519
commit fe4c2be
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,15 @@
 
 ### Major Changes
 
+## 15.1-3alvistack1 - 2020-01-15
+
+### Major Changes
+
+  - Replace `dumb-init` with `tini`, as like as `docker --init`
+  - Replace `java` with `openjdk`
+  - Replace `nodejs` with `node`
+  - Include release specific vars and tasks
+
 ## 15.1-2alvistack3 - 2019-11-05
 
 ### Major Changes

diff --git a/Dockerfile b/Dockerfile
@@ -28,7 +28,7 @@ WORKDIR "/root"
 
 EXPOSE 22
 
-ENTRYPOINT [ "dumb-init", "--", "docker-entrypoint.sh" ]
+ENTRYPOINT [ "tini", "-g", "--", "docker-entrypoint.sh" ]
 CMD        [ "/usr/sbin/sshd", "-eD" ]
 
 # Hotfix for CVE-2019-5021
@@ -37,7 +37,7 @@ RUN sed -i -e 's/^root::/root:*:/' /etc/shadow
 # Prepare Zypper dependencies
 RUN set -ex \
     && zypper -n --gpg-auto-import-keys refresh \
-    && zypper -n install -y ca-certificates* curl gcc git libffi-devel libopenssl-devel lsb-release make python3 python3-devel python3-xml sudo \
+    && zypper -n install -y ca-certificates* curl gcc git libffi-devel libopenssl-devel lsb-release make python3 python3-devel sudo \
     && zypper clean --all
 
 # Install PIP

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