Fix an error caused by docker/docker-py#3113 (notthebee#180)

Fixes notthebee#179

Author: notthebee

.github/workflows/ci.yml

@@ -24,18 +24,6 @@ on:
         type: boolean
         default: false
 
-      only_rocky_8:
-        description: "Only run on Rocky 8"
-        required: false
-        type: boolean
-        default: false
-
-      only_rocky_9:
-        description: "Only run on Rocky 9"
-        required: false
-        type: boolean
-        default: false
-
       manual_mode:
         description: "Don't destroy the server after the setup is complete"
         required: false
@@ -82,12 +70,6 @@ jobs:
           elif [[ ${ONLY_DEBIAN_11} == 'true' ]]; then
             # Only deploy on Debian 11, don't use Letsencrypt Staging
             matrix=$(jq 'map(. | select((.os=="debian-11")) )' .github/workflows/matrix_includes.json)
-          elif [[ ${ONLY_ROCKY_8} == 'true' ]]; then
-            # Only deploy on Rocky 8, don't use Letsencrypt Staging
-            matrix=$(jq 'map(. | select((.os=="rocky-8")) )' .github/workflows/matrix_includes.json)
-          elif [[ ${ONLY_ROCKY_9} == 'true' ]]; then
-            # Only deploy on Rocky 9, don't use Letsencrypt Staging
-            matrix=$(jq 'map(. | select((.os=="rocky-9")) )' .github/workflows/matrix_includes.json)
           else
             # Deploy on all supported OSes, use Letsencrypt Staging to avoid rate-limiting
             matrix=$(jq 'map(.)' .github/workflows/matrix_includes.json)
@@ -98,8 +80,6 @@ jobs:
           ONLY_UBUNTU_22: ${{ inputs.only_ubuntu_22 }}
           ONLY_UBUNTU_20: ${{ inputs.only_ubuntu_20 }}
           ONLY_DEBIAN_11: ${{ inputs.only_debian_11 }}
-          ONLY_ROCKY_8: ${{ inputs.only_rocky_8 }}
-          ONLY_ROCKY_9: ${{ inputs.only_rocky_9 }}
 
   build:
     runs-on: ubuntu-latest
@@ -141,14 +121,6 @@ jobs:
             echo "EASYVPN_USERNAME_3=$EASYVPN_USERNAME" >> $GITHUB_OUTPUT
             echo "EASYVPN_PASSWORD_3=$EASYVPN_PASSWORD" >> $GITHUB_OUTPUT
             ;;
-            "4")
-            echo "EASYVPN_USERNAME_4=$EASYVPN_USERNAME" >> $GITHUB_OUTPUT
-            echo "EASYVPN_PASSWORD_4=$EASYVPN_PASSWORD" >> $GITHUB_OUTPUT
-            ;;
-            "5")
-            echo "EASYVPN_USERNAME_5=$EASYVPN_USERNAME" >> $GITHUB_OUTPUT
-            echo "EASYVPN_PASSWORD_5=$EASYVPN_PASSWORD" >> $GITHUB_OUTPUT
-            ;;
             *)
             exit 1
             ;;
@@ -183,12 +155,6 @@ jobs:
           matrix.os  == 'ubuntu-22.04' ||
           matrix.os == 'ubuntu-20.04'
 
-      - name: Install git and expect (CentOS 8 and 9)
-        run: ssh root@$SERVER_IPV4 dnf install -y git expect words
-        if: |
-          matrix.os == 'rocky-8' ||
-          matrix.os == 'rocky-9'
-
       - uses: infraway/[email protected]
         with:
           type: "A"
@@ -271,13 +237,9 @@ jobs:
       EASYVPN_USERNAME_1: "${{ steps.random_username.outputs.EASYVPN_USERNAME_1 }}"
       EASYVPN_USERNAME_2: "${{ steps.random_username.outputs.EASYVPN_USERNAME_2 }}"
       EASYVPN_USERNAME_3: "${{ steps.random_username.outputs.EASYVPN_USERNAME_3 }}"
-      EASYVPN_USERNAME_4: "${{ steps.random_username.outputs.EASYVPN_USERNAME_4 }}"
-      EASYVPN_USERNAME_5: "${{ steps.random_username.outputs.EASYVPN_USERNAME_5 }}"
       EASYVPN_PASSWORD_1: "${{ steps.random_username.outputs.EASYVPN_PASSWORD_1 }}"
       EASYVPN_PASSWORD_2: "${{ steps.random_username.outputs.EASYVPN_PASSWORD_2 }}"
       EASYVPN_PASSWORD_3: "${{ steps.random_username.outputs.EASYVPN_PASSWORD_3 }}"
-      EASYVPN_PASSWORD_4: "${{ steps.random_username.outputs.EASYVPN_PASSWORD_4 }}"
-      EASYVPN_PASSWORD_5: "${{ steps.random_username.outputs.EASYVPN_PASSWORD_5 }}"
 
   test:
     runs-on: ubuntu-latest

.github/workflows/matrix_includes.json

@@ -10,13 +10,5 @@
     {
         "os":"debian-11",        
         "index":3
-    },
-    {
-        "os":"rocky-8",        
-        "index":4
-    },
-    {
-        "os":"rocky-9",        
-        "index":5
     }
 ]

README.md

@@ -27,8 +27,8 @@ wget https://raw.githubusercontent.com/notthebee/ansible-easy-vpn/main/bootstrap
   * Ubuntu Server 22.04
   * Ubuntu Server 20.04
   * Debian 11
-  * Rocky Linux 9
-  * Rocky Linux 8
+  * ~~Rocky Linux 8~~ – not supported anymore
+  * ~~Rocky Linux 9~~ - not supported anymore
 
 ## Known issues with VPS providers
 Normally, the script should work on any KVM-based VPS.

bootstrap.sh

@@ -423,7 +423,7 @@ if [[ "$launch_playbook" =~ ^[yY]$ ]]; then
     cd $HOME/ansible-easy-vpn && ansible-playbook run.yml
   fi
 else
-  echo "You can run the playbook by executing the following command"
-  echo "cd ${HOME}/ansible-easy-vpn && ansible-playbook run.yml"
+  echo "You can run the playbook by executing this script again"
+  echo "cd ${HOME}/ansible-easy-vpn && bash bootstrap.sh"
   exit
 fi

requirements.txt

@@ -1,7 +1,7 @@
 cryptography<=36.0.2
 pyOpenSSL<=20.0.1
 certbot
-requests
+requests<2.29.2
 passlib 
 bcrypt 
 wheel

roles/system/tasks/user.yml

@@ -53,9 +53,13 @@
         dest: "/home/{{ username }}"
 
     - name: Fix the user's venv copy
+      tags:
+        - skip_ansible_lint # risky-pipe-shell confuses sed separators for pipes
       changed_when: true
       ansible.builtin.shell:
-        cmd: 'cd /home/{{ username }}/ansible-easy-vpn/.venv/bin && sed -i "s|/root/ansible-easy-vpn|/home/{{ username }}/ansible-easy-vpn|g" *'
+        cmd: >-
+          cd /home/{{ username }}/ansible-easy-vpn/.venv/bin &&
+          sed -i "s|/root/ansible-easy-vpn|/home/{{ username }}/ansible-easy-vpn|g" *
 
     - name: Chmod the ansible-easy-vpn directory
       ansible.builtin.file: