Merge branch 'release/7.4.1-3alvistack1'

CHANGELOG.md

@@ -4,7 +4,13 @@
 
 ### Major Changes
 
-  - Prepare `/etc/php/*` as upstream image
+## 7.4.1-3alvistack1 - 2020-01-15
+
+### Major Changes
+
+  - Replace `dumb-init` with `tini`, as like as `docker --init`
+  - Include release specific vars and tasks
+  - Revamp template for `/etc/php/`
 
 ## 7.4.1-2alvistack1 - 2019-12-27
 

Dockerfile

@@ -21,7 +21,7 @@ ENV TZ     "UTC"
 
 ENV PHP_RELEASE "7.4"
 
-ENTRYPOINT [ "dumb-init", "--", "docker-entrypoint.sh" ]
+ENTRYPOINT [ "tini", "-g", "--", "docker-entrypoint.sh" ]
 CMD        [ "php7.4", "-a" ]
 
 # Hotfix for en_US.utf8 locale

README.md

@@ -25,7 +25,7 @@ This Docker container makes it easy to get an instance of PHP up and running.
 
 Based on [Official Ubuntu Docker Image](https://hub.docker.com/_/ubuntu/) with some minor hack:
 
-  - Handle `ENTRYPOINT` with [dumb-init](https://github.com/Yelp/dumb-init)
+  - Handle `ENTRYPOINT` with [tini](https://github.com/krallin/tini)
   - Change `User` and `Group` to `www-data`
   - Change `DocumentRoot` to `/var/www/html`
   - Additional PHP extensions:

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

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

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