Merge branch 'release/4.4.0'

CHANGELOG.md

@@ -1,9 +1,15 @@
 # Ansible Role for Podman
 
-## 4.4.0 - TBC
+## 4.5.0 - TBC
 
 ### Major Changes
 
+## 4.4.0 - 2020-06-04
+
+### Major Changes
+
+  - Install bash completion
+  - Install with static binary archive
   - Support Fedora 32
   - Support Debian 10
   - `molecule -s default` with delegated to localhost

ansible-galaxy-requirements.yml

@@ -28,14 +28,6 @@ roles:
     src: https://github.com/alvistack/ansible-role-python
     version: develop
 
-  - name: git
-    src: https://github.com/alvistack/ansible-role-git
-    version: develop
-
-  - name: golang
-    src: https://github.com/alvistack/ansible-role-golang
-    version: develop
-
   - name: cni_plugins
     src: https://github.com/alvistack/ansible-role-cni_plugins
     version: develop
@@ -44,8 +36,8 @@ roles:
     src: https://github.com/alvistack/ansible-role-containers_common
     version: develop
 
-  - name: runc
-    src: https://github.com/alvistack/ansible-role-runc
+  - name: crun
+    src: https://github.com/alvistack/ansible-role-crun
     version: develop
 
   - name: conmon

defaults/main.yml

@@ -15,7 +15,7 @@
 # limitations under the License.
 
 # Podman version.
-podman_version: "v1.9.2"
+podman_version: "v1.9.3"
 
 # Podman download details.
 podman_download: "{{ _podman_download[podman_version] }}"

molecule/default/converge.yml

@@ -22,14 +22,6 @@
         name: python
       tags: python
 
-    - include_role:
-        name: git
-      tags: git
-
-    - include_role:
-        name: golang
-      tags: golang
-
     - include_role:
         name: cni_plugins
       tags: cni_plugins
@@ -39,8 +31,8 @@
       tags: containers_common
 
     - include_role:
-        name: runc
-      tags: runc
+        name: crun
+      tags: crun
 
     - include_role:
         name: conmon

tasks/main.yml

@@ -56,12 +56,12 @@
     mode: "{{ item.mode | default('0755') }}"
     state: "{{ item.state | default('directory') }}"
   loop:
+    - { dest: "/etc/bash_completion.d" }
     - { dest: "/etc/cni/net.d" }
     - { dest: "/usr/local/bin" }
     - { dest: "/usr/local/lib/systemd/system" }
     - { dest: "/usr/local/lib/systemd/user" }
     - { dest: "/usr/local/lib/tmpfiles.d" }
-    - { dest: "/usr/local/share/bash-completion/completions" }
     - { dest: "/usr/share/containers" }
     - { dest: "{{ podman_download.dest | dirname }}" }
   tags: podman
@@ -80,30 +80,19 @@
   until: get_url_result is succeeded
   tags: podman
 
-- name: build package
-  environment:
-    PATH: "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+- name: unarchive package
   shell: |
     set -o pipefail
+    cd /usr/local/bin
     TMP_DIR="$(mktemp -d)" \
-      && export GOPATH=$TMP_DIR \
-      && export PATH="$GOPATH/bin:$PATH" \
-      && cd $GOPATH \
-      && go get -u github.com/cpuguy83/go-md2man \
-      && mkdir -p $GOPATH/src/github.com/containers/libpod \
-      && cd $GOPATH/src/github.com/containers/libpod \
-      && tar -zx -C . -f {{ podman_download.dest }} --strip-components=1 \
-      && export BUILDTAGS="btrfs_noversion exclude_graphdriver_btrfs exclude_graphdriver_devicemapper apparmor seccomp selinux" \
-      && make \
-      && make install.bin \
-      && make install.remote \
-      && make install.completions \
+      && cp {{ podman_download.dest }} $TMP_DIR/podman \
+      && chown root:root $TMP_DIR/podman \
+      && chmod 0755 $TMP_DIR/podman \
+      && mv $TMP_DIR/podman . \
       && rm -rf $TMP_DIR
   args:
     executable: "/bin/bash"
   when: get_url_result is changed
-  register: result
-  until: result is succeeded
   tags: podman
 
 - name: copy templates
@@ -114,6 +103,7 @@
     group: "{{ item.group | default('root') }}"
     mode: "{{ item.mode | default('0644') }}"
   loop:
+    - { dest: "/etc/bash_completion.d/podman" }
     - { dest: "/etc/cni/net.d/87-podman-bridge.conflist" }
     - { dest: "/usr/local/lib/systemd/system/io.podman.service" }
     - { dest: "/usr/local/lib/systemd/system/io.podman.socket" }
@@ -130,12 +120,12 @@
     mode: "{{ item.mode | default('0644') }}"
     state: "{{ item.state | default('file') }}"
   loop:
+    - { dest: "/etc/bash_completion.d/podman" }
     - { dest: "/etc/cni/net.d/87-podman-bridge.conflist" }
     - { dest: "/usr/local/bin/podman", mode: "0755" }
     - { dest: "/usr/local/lib/systemd/system/io.podman.service" }
     - { dest: "/usr/local/lib/systemd/system/io.podman.socket" }
     - { dest: "/usr/local/lib/systemd/user/io.podman.service" }
     - { dest: "/usr/local/lib/systemd/user/io.podman.socket" }
     - { dest: "/usr/local/lib/tmpfiles.d/podman.conf" }
-    - { dest: "/usr/local/share/bash-completion/completions/podman" }
   tags: podman

tasks/redhat.yml

@@ -18,7 +18,6 @@
   yum:
     name: "{{ item.name }}"
     state: "{{ item.state }}"
-    enablerepo: "{{ item.enablerepo | default(None) or omit }}"
   loop: "{{ _yum }}"
   register: result
   until: result is succeeded