Update Jenkinsfile Docker image to 24.04. Add Dockerfile to build_ign…

…ore.

galaxy.yml

@@ -2,7 +2,7 @@ namespace: dseeley
 
 name: ansible_vault_pipe
 
-version: AUTOFILLED_BY_JENKINS
+version: 0.0.0       # This is automatically filled by Jenkins on galaxy release with the current git release tag number.
 
 readme: README.md
 
@@ -28,5 +28,5 @@ homepage: https://github.com/dseeley/ansible_vault_pipe
 
 issues: https://github.com/dseeley/ansible_vault_pipe/issues
 
-build_ignore: [ '.idea', '.gitignore' ]
+build_ignore: [ '.idea', '.gitignore', 'Dockerfile*' ]
 

jenkinsfiles/Jenkinsfile_release_tag

@@ -16,26 +16,20 @@ def create_custom_image(image_name, build_opts = "") {
         def jenkins_gid = sh(script: "id -g  ${jenkins_username}", returnStdout: true).trim()
 
         def dockerfile = """
-            FROM ubuntu:22.04
+            FROM ubuntu:24.04
             ARG DEBIAN_FRONTEND=noninteractive
             ENV JENKINS_HOME=${env.JENKINS_HOME}
             ENV HOME=${env.JENKINS_HOME}
-            ENV PIPENV_VENV_IN_PROJECT=true
             ENV TZ=Europe/London
             SHELL ["/bin/bash", "-c"]
 
             RUN groupadd -g ${jenkins_gid} ${jenkins_username} && useradd -m -u ${jenkins_uid} -g ${jenkins_gid} -s /bin/bash ${jenkins_username}
-            ### Note: use pip to install pipenv (not apt) to avoid pypa/pipenv#2196 (when using PIPENV_VENV_IN_PROJECT)
             RUN apt-get update \
-                && apt-get install -y git iproute2 python3-boto python3-boto3 python3-dev python3-distutils python3-docker python3-dnspython python3-google-auth python3-googleapi python3-jinja2 python3-jmespath python3-libcloud python3-libvirt python3-lxml python3-netaddr python3-paramiko python3-passlib python3-pip python3-pyvmomi python3-ruamel.yaml python3-setuptools python3-wheel python3-xmltodict \
-                && pip3 --no-cache-dir install pycdlib pipenv ansible==${params.ANSIBLE_VERSION}
+                && apt-get install -y git iproute2 python3-pip python3-jmespath python3-jinja2 python3-boto3 python3-netaddr python3-paramiko python3-libvirt python3-lxml python3-xmltodict python3-pycdlib python3-google-auth python3-dev python3-setuptools python3-wheel \
+                && pip3 --no-cache-dir install --break-system-packages ansible==${params.ANSIBLE_VERSION}
 
-            ### Install community.libvirt:==1.2.0 if our Ansible version is < 6.3.0 (it is otherwise included in the pypi release) and azure.azcollection:==1.13.0 if our Ansible version is <= 6.0.0 (it is otherwise included in the pypi release)
-            RUN if [ \$(echo -e "\$(pip3 --no-cache-dir show ansible | grep ^Version | sed -r 's/^Version: (.*)/\\1/')\\n6.4.0"|sort|head -1) != "6.4.0" ]; then ansible-galaxy collection install community.libvirt:==1.2.0 -p \$(pip3 --no-cache-dir show ansible | grep ^Location | sed 's/Location: \\(.*\\)/\\1/') --force && chown -R jenkins.jenkins ~/.ansible; fi \
-                && if [ \$(echo -e "\$(pip3 --no-cache-dir show ansible | grep ^Version | sed -r 's/^Version: (.*)/\\1/')\\n6.1.0"|sort|head -1) != "6.1.0" ]; then ansible-galaxy collection install azure.azcollection:==1.13.0 -p \$(pip3 --no-cache-dir show ansible | grep ^Location | sed -r 's/Location: (.*)/\\1/') --force && chown -R jenkins.jenkins ~/.ansible; fi
-
-            ### Install the azcollection/requirements-azure.txt dependencies (in the default python library location)
-            RUN pip3 --no-cache-dir install -r \$(pip3 --no-cache-dir show ansible | grep ^Location | sed -r 's/^Location: (.*)/\\1/')/ansible_collections/azure/azcollection/requirements-azure.txt
+            ### Install the azcollection/requirements[-azure].txt dependencies (in the default python library location)
+            RUN pip3 --no-cache-dir install --break-system-packages -r \$(pip3 --no-cache-dir show ansible | grep ^Location | sed -r 's/^Location: (.*)/\\1/')/ansible_collections/azure/azcollection/requirements*.txt
             """.stripIndent()
 
         writeFile(file: "Dockerfile_${image_name}", text: dockerfile, encoding: "UTF-8")