Skip to content

Commit

Permalink
fix: image tagging and nolog
Browse files Browse the repository at this point in the history
- ensure correct tag for alpine 3.20
- correct tagging for current fedora versions
- nolog true for push list
  • Loading branch information
jomrr committed Sep 14, 2024
1 parent f4a7c7e commit 0dcc72e
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 14 deletions.
18 changes: 13 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand All @@ -55,7 +63,7 @@ $(DEPS):
@echo "" >> $@

$(REQS):
@echo "ansible >= 2.15" > $@
@echo "ansible" > $@
@echo "commitizen" >> $@
@echo "pre-commit" >> $@
@echo "python-semantic-release" >> $@
Expand Down Expand Up @@ -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)
Expand Down
14 changes: 6 additions & 8 deletions containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ all:
hosts:
alpine-3.20:
build_tags:
- 3.20
- "3.20"
- 3
- latest
alpine-3.19:
build_tags:
Expand Down Expand Up @@ -93,6 +94,9 @@ all:
container_image: debian
fedora:
hosts:
fedora-41:
build_tags:
- 41
fedora-40:
build_tags:
- 40
Expand All @@ -102,7 +106,7 @@ all:
- 39
fedora-rawhide:
build_tags:
- 41
- 42
- rawhide
vars:
build_image: fedora
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion playbooks/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 0dcc72e

Please # to comment.