Fixed builds

ansible-versions.yml

@@ -90,29 +90,12 @@ operating_system_distributions:
           - "libssl-dev"
           - "openssh-client"
           - "sshpass"
-      - name: "bookworm"
-        package_dependencies:
-          - "git"
-          - "libffi-dev"
-          - "libssl-dev"
-          - "openssh-client"
-          - "sshpass"
 
   - name: "alpine"
     versions:
       - name: "alpine3.20"
         latest_stable: true
         package_dependencies:
-          - "build-base"
-          - "git"
-          - "libffi-dev"
-          - "openssh-client"
-          - "openssl-dev"
-          - "rsync"
-          - "sshpass"
-      - name: "alpine3.19"
-        package_dependencies:
-          - "build-base"
           - "git"
           - "libffi-dev"
           - "openssh-client"

build.sh

@@ -306,7 +306,10 @@ build_docker_image() {
     local package_dependencies=$(get_package_dependencies "$os_family")
 
     # Get the full patch version and save it to GITHUB_ENV
-    local full_ansible_version=$(lookup_and_save_ansible_version "$ANSIBLE_VARIATION" "$ANSIBLE_VERSION")
+    local full_ansible_version=$(lookup_and_save_ansible_version "$ANSIBLE_VARIATION" "$ANSIBLE_VERSION" | tail -n1)
+
+    # Remove any ANSI color codes from the version string
+    full_ansible_version=$(echo "$full_ansible_version" | sed 's/\x1b\[[0-9;]*m//g')
 
     build_args=(
         --build-arg ANSIBLE_VARIATION="$ANSIBLE_VARIATION"
@@ -336,7 +339,7 @@ build_docker_image() {
 
     # Construct the Docker command as an array
     docker_command=(
-        docker --debug buildx build
+        docker buildx build
         "${DOCKER_ADDITIONAL_BUILD_ARGS[@]}"
         "${build_args[@]}"
         --file "src/Dockerfile"

src/Dockerfile

@@ -17,6 +17,9 @@ RUN /usr/bin/local/serversideup-dep-install-alpine ${PACKAGE_DEPENDENCIES} && \
     /usr/bin/local/serversideup-dep-install-debian ${PACKAGE_DEPENDENCIES}
 
 # Install Ansible
-RUN pip3 install ${ANSIBLE_VARIATION}==${ANSIBLE_VERSION}
+RUN set -ex && \
+    echo "🤓 Installing ${ANSIBLE_VARIATION}==${ANSIBLE_VERSION}" && \
+    pip3 install --no-cache-dir ${ANSIBLE_VARIATION}==${ANSIBLE_VERSION} && \
+    ansible --version
 
 CMD ["ansible-playbook", "--version"]