Merge branch 'release/5.1.1-4alvistack1'

alvistack · Jun 2, 2020 · 4dc9338 · 4dc9338
2 parents b257dd7 + 97ee8df
commit 4dc9338
Show file tree

Hide file tree

Showing 21 changed files with 21 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,7 @@ language: shell
 
 env:
   jobs:
-    - MOLECULE_SCENARIO_NAME="5.0"
+    - MOLECULE_SCENARIO_NAME="5.1"
 
 before_install:
   - |

diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ Learn more about mitmproxy: <https://docs.mitmproxy.org/>
 
 ## Supported Tags and Respective `Dockerfile` Links
 
-  - [`5.0`, `latest`](https://github.com/alvistack/docker-mitmproxy/blob/master/molecule/5.0/Dockerfile.j2)
+  - [`5.1`, `latest`](https://github.com/alvistack/docker-mitmproxy/blob/master/molecule/5.1/Dockerfile.j2)
 
 ## Overview
 

diff --git a/inventory/default/group_vars/all/00-defaults.yml b/inventory/default/group_vars/all/00-defaults.yml
@@ -14,4 +14,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-mitmproxy_version: "5.0.1"
+mitmproxy_version: "5.1.1"
diff --git a/molecule/5.0/Dockerfile.j2 → molecule/5.1/Dockerfile.j2 b/molecule/5.0/Dockerfile.j2 → molecule/5.1/Dockerfile.j2
diff --git a/molecule/5.0/converge.yml → molecule/5.1/converge.yml b/molecule/5.0/converge.yml → molecule/5.1/converge.yml
diff --git a/molecule/5.0/create.yml → molecule/5.1/create.yml b/molecule/5.0/create.yml → molecule/5.1/create.yml
diff --git a/molecule/5.0/destroy.yml → molecule/5.1/destroy.yml b/molecule/5.0/destroy.yml → molecule/5.1/destroy.yml
diff --git a/molecule/5.0/group_vars/all/00-defaults.yml → molecule/5.1/group_vars/all/00-defaults.yml b/molecule/5.0/group_vars/all/00-defaults.yml → molecule/5.1/group_vars/all/00-defaults.yml
diff --git a/molecule/5.0/group_vars/all/99-molecule.yml → molecule/5.1/group_vars/all/99-molecule.yml b/molecule/5.0/group_vars/all/99-molecule.yml → molecule/5.1/group_vars/all/99-molecule.yml
@@ -14,4 +14,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-mitmproxy_version: "5.0.1"
+mitmproxy_version: "5.1.1"
diff --git a/molecule/5.0/molecule.yml → molecule/5.1/molecule.yml b/molecule/5.0/molecule.yml → molecule/5.1/molecule.yml
@@ -27,8 +27,10 @@ lint: |
 dependency:
   name: galaxy
   options:
-    role-file: ansible-role-requirements.yml
-    roles-path: /.ansible/roles:/usr/share/ansible/roles:/etc/ansible/roles
+    role-file: ansible-galaxy-requirements.yml
+    roles-path: ${HOME}/.ansible/roles
+    requirements-file: ansible-galaxy-requirements.yml
+    collections-path: ${HOME}/.ansible/collections
     ignore-errors: true
 provisioner:
   name: ansible

diff --git a/molecule/5.0/prepare.yml → molecule/5.1/prepare.yml b/molecule/5.0/prepare.yml → molecule/5.1/prepare.yml
diff --git a/molecule/5.0/side_effect.yml → molecule/5.1/side_effect.yml b/molecule/5.0/side_effect.yml → molecule/5.1/side_effect.yml
diff --git a/molecule/5.0/verify.yml → molecule/5.1/verify.yml b/molecule/5.0/verify.yml → molecule/5.1/verify.yml
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -27,8 +27,10 @@ lint: |
 dependency:
   name: galaxy
   options:
-    role-file: ansible-role-requirements.yml
-    roles-path: /.ansible/roles:/usr/share/ansible/roles:/etc/ansible/roles
+    role-file: ansible-galaxy-requirements.yml
+    roles-path: ${HOME}/.ansible/roles
+    requirements-file: ansible-galaxy-requirements.yml
+    collections-path: ${HOME}/.ansible/collections
     ignore-errors: true
 provisioner:
   name: ansible

diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml
@@ -30,20 +30,23 @@
       raw: |
         set -ex
         setenforce 0
+        sed -i 's/^SELINUX=.*$/SELINUX=permissive/g' /etc/selinux/config
       changed_when: false
       ignore_errors: true
 
     - name: systemctl stop firewalld.service
       raw: |
         set -ex
         systemctl stop firewalld.service
+        systemctl disable firewalld.service
       changed_when: false
       ignore_errors: true
 
     - name: systemctl stop ufw.service
       raw: |
         set -ex
         systemctl stop ufw.service
+        systemctl disable ufw.service
       changed_when: false
       ignore_errors: true
 

diff --git a/roles/gosu b/roles/gosu
diff --git a/roles/locales b/roles/locales
diff --git a/roles/mitmproxy b/roles/mitmproxy
diff --git a/roles/python b/roles/python
diff --git a/roles/timezone b/roles/timezone
diff --git a/roles/tini b/roles/tini
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ language: shell @@
     env:
       jobs:
-        - MOLECULE_SCENARIO_NAME="5.0"
+        - MOLECULE_SCENARIO_NAME="5.1"
     before_install:
       - |
@@ Expand Down @@
+2 −1		.travis.yml
+1 −1		README.md
+13 −3		ansible-galaxy-requirements.yml
+4 −2		molecule/centos-7/molecule.yml
+4 −2		molecule/centos-8/molecule.yml
+4 −2		molecule/debian-10/molecule.yml
+2 −0		molecule/default/converge.yml
+4 −2		molecule/default/molecule.yml
+3 −0		molecule/default/prepare.yml
+4 −2		molecule/fedora-32/molecule.yml
+4 −2		molecule/redhat-7/molecule.yml
+4 −2		molecule/redhat-8/molecule.yml
+4 −2		molecule/suse-15/molecule.yml
+4 −2		molecule/ubuntu-18.04/molecule.yml
+4 −2		molecule/ubuntu-19.10/molecule.yml
+4 −2		molecule/ubuntu-20.04/molecule.yml
+1 −0		requirements.txt