From 0dcc72eab75984518b1b0725d482efafcd65ae59 Mon Sep 17 00:00:00 2001
From: Jonas Mauer <jonas.mauer@web.de>
Date: Sat, 14 Sep 2024 13:04:29 +0200
Subject: [PATCH] fix: image tagging and nolog

- ensure correct tag for alpine 3.20
- correct tagging for current fedora versions
- nolog true for push list
---
 Makefile            | 18 +++++++++++++-----
 containers.yml      | 14 ++++++--------
 playbooks/build.yml |  2 +-
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 1ae16a5..8857161 100644
--- a/Makefile
+++ b/Makefile
@@ -37,13 +37,21 @@ help:
 	@echo "Usage: make [target] [LIMIT=<hostname or group>]"
 	@echo
 	@echo "Targets:"
+	@echo "  install    - create virtual environment"
+	@echo "  upgrade    - update requirements in virtual environment"
 	@echo "  all        - build all distributions"
+	@echo "  <distro>   - build specific distribution"
 	@echo "  clean      - remove virtual environment"
+	@echo "  commit     - commit changes to the current branch"
 	@echo "  dist-clean - remove virtual environment and build artifacts"
-	@echo "  install    - create virtual environment"
+	@echo "  docker     - build docker images"
 	@echo "  limit      - build artifacts limited to LIMIT parameter"
-	@echo "  upgrade    - update requirements in virtual environment"
-	@echo "  <distro>   - build specific distribution"
+	@echo "  prepare-release - prepare a release and merge dev to main"
+	@echo "  version    - bump the version number and update the changelog"
+	@echo "  publish    - create a new Git tag and build the distribution files"
+	@echo "  checkout-dev - checkout the dev branch"
+	@echo "  start-feature - start a new feature branch"
+	@echo "  merge-feature-to-dev - merge a feature branch to dev"
 	@echo
 	@echo "Supported distributions:"
 	@echo "  $(distributions)"
@@ -55,7 +63,7 @@ $(DEPS):
 	@echo "" >> $@
 
 $(REQS):
-	@echo "ansible >= 2.15" > $@
+	@echo "ansible" > $@
 	@echo "commitizen" >> $@
 	@echo "pre-commit" >> $@
 	@echo "python-semantic-release" >> $@
@@ -85,7 +93,7 @@ dist-clean: clean
 # --- Ansible/Build targets ----------------------------------------------------
 .PHONY: $(distributions) all docker limit
 
-$(distributions): $(VENV)
+$(distributions): | $(VENV)
 	@$(PLAYBOOK) playbooks/build.yml --limit=$@
 
 all: $(distributions)
diff --git a/containers.yml b/containers.yml
index 10298cc..1ed17a4 100644
--- a/containers.yml
+++ b/containers.yml
@@ -28,7 +28,8 @@ all:
       hosts:
         alpine-3.20:
           build_tags:
-            - 3.20
+            - "3.20"
+            - 3
             - latest
         alpine-3.19:
           build_tags:
@@ -93,6 +94,9 @@ all:
         container_image: debian
     fedora:
       hosts:
+        fedora-41:
+          build_tags:
+            - 41
         fedora-40:
           build_tags:
             - 40
@@ -102,7 +106,7 @@ all:
             - 39
         fedora-rawhide:
           build_tags:
-            - 41
+            - 42
             - rawhide
       vars:
         build_image: fedora
@@ -114,12 +118,6 @@ all:
             - 15.6
             - 15
             - latest
-        opensuse-leap-15.5:
-          build_tags:
-            - 15.5
-        opensuse-leap-15.4:
-          build_tags:
-            - 15.4
         opensuse-tumbleweed:
           build_image: opensuse-tumbleweed
           build_tags:
diff --git a/playbooks/build.yml b/playbooks/build.yml
index 70752ec..98fcfce 100644
--- a/playbooks/build.yml
+++ b/playbooks/build.yml
@@ -40,7 +40,7 @@
         _images: []
 
     - name: "Build container images and push to registries"
-      no_log: false
+      no_log: true
       containers.podman.podman_image:
         name: "{{ item.name }}/{{ item.username }}/molecule-{{ item.image }}"
         build: