Skip to content

Commit 20a2059

Browse files
committed
updated builder image and Cybus Connectware Ansible collection to version 2.3.0
1 parent 6e74a64 commit 20a2059

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
ARG ANSIBLE_VERSION
2-
ARG ANSIBLE_CONNECTWARE_COLLECTION_VERSION
32
ARG AWS
43

54
# --------------------------------------------------------------------------------------------------
65
# Builder Image
76
# --------------------------------------------------------------------------------------------------
8-
FROM alpine:3.20 AS builder
7+
FROM alpine:3.21.3 AS builder
98

109
# Required tools for building Python packages
1110
RUN set -eux \
@@ -64,7 +63,7 @@ COPY --from=builder /usr/bin/docker /usr/bin/docker
6463
# add mqtt and json/yaml tools & upgrade ansible
6564
RUN pip3 install paho-mqtt boto3 ansible --upgrade
6665
RUN apk add mosquitto mosquitto-clients jq yq
67-
RUN ansible-galaxy collection install community.general amazon.aws cybus.connectware:${ANSIBLE_CONNECTWARE_COLLECTION_VERSION:-2.2.3}
66+
RUN ansible-galaxy collection install community.general amazon.aws cybus.connectware:2.3.0
6867

6968
WORKDIR /data
7069
ENTRYPOINT ["/docker-entrypoint.sh"]

README.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,19 @@ as a base image and supports provisioning with dynamic host lists based on AWS r
1818

1919
To build the image manually execute (optionally set build-args as listed on top of the Dockerfile):
2020

21+
```bash
22+
docker buildx build \
23+
--attest type=provenance,mode=max --sbom=true \
24+
--platform linux/amd64,linux/arm64 \
25+
-t jforge/ansible-aws-cybus . --push
2126
```
22-
docker build --no-cache -t jforge/ansible-aws-cybus .
27+
28+
Push attestation for a cleaner docker scout report:
29+
```bash
30+
docker scout push --org jforge jforge/ansible-aws-cybus
2331
```
2432

33+
2534
Test proper docker and docker-compose availability:
2635

2736
```
@@ -115,7 +124,8 @@ docker run --rm -v $(pwd):/data \
115124
List the versions of the contained tools with:
116125

117126
```bash
118-
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'
127+
docker run --rm -it jforge/ansible-aws-cybus:latest /bin/bash -c \
128+
'ansible --version | grep "python version" && python --version && python3 --version && pip3 --version && pip --version && pip list | grep boto && pip3 list | grep boto && ansible-galaxy collection list | grep cybus.connectware'
119129
```
120130

121131
## References

0 commit comments

Comments
 (0)