updated builder image, base image and Cybus ansible collection, housekeeping

Author: jforge

Dockerfile

@@ -5,7 +5,7 @@ ARG AWS
 # --------------------------------------------------------------------------------------------------
 # Builder Image
 # --------------------------------------------------------------------------------------------------
-FROM alpine:3.16 AS builder
+FROM alpine:3.20 AS builder
 
 # Required tools for building Python packages
 RUN set -eux \
@@ -20,32 +20,51 @@ RUN set -eux \
 		openssl-dev \
 		python3 \
 		python3-dev \
-		py-pip \
+		py3-pip \
 		docker \
 		docker-cli-compose
 
 # Python packages (copied to final image)
 RUN set -eux \
-	&& pip3 install --no-cache-dir --no-compile \
-    docker \
-    jsondiff \
+	&& pip3 install --break-system-packages --no-cache-dir --no-compile \
+      docker \
+      jsondiff \
+	&& find /usr/lib/ -name '__pycache__' -print0 | xargs -0 -n1 rm -rf \
+	&& find /usr/lib/ -name '*.pyc' -print0 | xargs -0 -n1 rm -rf
+
+# Clean-up some site-packages to safe space
+RUN set -eux \
+	&& pip3 uninstall --break-system-packages --yes \
+		setuptools \
+		wheel \
 	&& find /usr/lib/ -name '__pycache__' -print0 | xargs -0 -n1 rm -rf \
 	&& find /usr/lib/ -name '*.pyc' -print0 | xargs -0 -n1 rm -rf
 
 # --------------------------------------------------------------------------------------------------
 # Final Image
 # --------------------------------------------------------------------------------------------------
-FROM cytopia/ansible:${ANSIBLE_VERSION:-latest}-${ANSIBLE_VERSION:-awshelm3.10} AS production
+FROM cytopia/ansible:${ANSIBLE_VERSION:-latest}-${ANSIBLE_VERSION:-awshelm3.11} AS production
 
 LABEL maintainer="jforge <[email protected]>"
+LABEL org.opencontainers.image.authors=
+LABEL org.opencontainers.image.created=
+LABEL org.opencontainers.image.description=
+LABEL org.opencontainers.image.documentation="https://github.com/jforge/docker-ansible-aws-cybus"
+LABEL org.opencontainers.image.name="ansible-aws-cybus"
+LABEL org.opencontainers.image.ref.name=
+LABEL org.opencontainers.image.revision=
+LABEL org.opencontainers.image.source="https://github.com/jforge/docker-ansible-aws-cybus"
+LABEL org.opencontainers.image.title="Ansible AWS Helm K8s Cybus collection"
+LABEL org.opencontainers.image.url="https://github.com/jforge/docker-ansible-aws-cybus"
+LABEL org.opencontainers.image.vendor="jforge"
 
-COPY --from=builder /usr/lib/python3.10/site-packages/ /usr/lib/python3.10/site-packages/
+COPY --from=builder /usr/lib/python3.12/site-packages/ /usr/lib/python3.12/site-packages/
 COPY --from=builder /usr/bin/docker /usr/bin/docker
 
 # add mqtt and json/yaml tools & upgrade ansible 
 RUN pip3 install paho-mqtt boto3 ansible --upgrade
 RUN apk add mosquitto mosquitto-clients jq yq
-RUN ansible-galaxy collection install community.general amazon.aws cybus.connectware:${ANSIBLE_CONNECTWARE_COLLECTION_VERSION:-2.2.1}
+RUN ansible-galaxy collection install community.general amazon.aws cybus.connectware:${ANSIBLE_CONNECTWARE_COLLECTION_VERSION:-2.2.3}
 
 WORKDIR /data
 ENTRYPOINT ["/docker-entrypoint.sh"]

README.md

@@ -110,6 +110,14 @@ docker run --rm -v $(pwd):/data \
         CONNECTWARE_AGENT_COMPOSE_FILE_PATH: local-agent
 ```
 
+## Tool versions
+
+List the versions of the contained tools with:
+
+```bash
+docker run --rm -it jforge/ansible-aws-cybus:latest /bin/bash -c 'ansible --version | grep "python version" && python --version && python3 --version && pip3 --version && pip --version && pip list | grep boto && pip3 list | grep boto'
+```
+
 ## References
 
 - [Cybus](https://cybus.io)