Add ansible verbose pr 1.x (#174)

* Merging 1.x.

* Getting rid of bookworm in 1.x because Ansible cannot install on it.

* Missing paths to Dockerfile in some CI jobs.

Author: gregharvey

.github/workflows/ce-dev-PR-test.yml

@@ -30,6 +30,6 @@ jobs:
           rm -Rf mkcert
       - name: Build and test
         run: |
-          /bin/sh docker-images/export.sh --version latest --image-name ce-dev
-          /bin/sh docker-images/export.sh --version latest --image-name ce-dev-controller
+          /bin/sh docker-images/export.sh --version latest --image-name ce-dev --dockerfile-path base
+          /bin/sh docker-images/export.sh --version latest --image-name ce-dev-controller --dockerfile-path controller
           /bin/sh templates/prebuild.sh

.github/workflows/ce-dev-build-dev.yml

@@ -39,5 +39,5 @@ jobs:
       - name: Build and push Docker images
         run: |
           echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
-          /bin/sh docker-images/export.sh --version devel --image-name ce-dev --base-image debian:bookworm-slim --dockerfile-path base-devel --push
-          /bin/sh docker-images/export.sh --version devel --image-name ce-dev-controller --base-image debian:bookworm-slim --dockerfile-path controller-devel --push
+          /bin/sh docker-images/export.sh --version devel --image-name ce-dev --base-image debian:bullseye-slim --dockerfile-path base-devel --push
+          /bin/sh docker-images/export.sh --version devel --image-name ce-dev-controller --base-image debian:bullseye-slim --dockerfile-path controller-devel --push

.github/workflows/ce-dev-test.yml

@@ -34,6 +34,6 @@ jobs:
           rm -Rf mkcert
       - name: Build and test
         run: |
-          /bin/sh docker-images/export.sh --version latest --image-name ce-dev
-          /bin/sh docker-images/export.sh --version latest --image-name ce-dev-controller
+          /bin/sh docker-images/export.sh --version latest --image-name ce-dev --dockerfile-path base
+          /bin/sh docker-images/export.sh --version latest --image-name ce-dev-controller --dockerfile-path controller
           /bin/sh templates/prebuild.sh

docker-images/base-devel/Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:bookworm-slim as unison
+FROM debian:bullseye-slim as unison
 RUN \
   set -x && \
   export DEBIAN_FRONTEND=noninteractive && \
@@ -14,7 +14,7 @@ RUN \
   cd /tmp/unison-2.53.3 && \
   make
 
-FROM debian:bookworm-slim
+FROM debian:bullseye-slim
 
 RUN \
   set -x && \
@@ -100,4 +100,4 @@ ENV container docker
 STOPSIGNAL SIGRTMIN+3
 VOLUME [ "/sys/fs/cgroup", "/run", "/run/lock", "/tmp" ]
 
-ENTRYPOINT ["/sbin/init"]
+ENTRYPOINT ["/sbin/init"]