goldmann: We should add tests for this.
diff --git a/cekit/builders/buildah.py b/cekit/builders/buildah.py
index 004e543..111b77b 100644
--- a/cekit/builders/buildah.py
+++ b/cekit/builders/buildah.py
@@ -30,6 +30,9 @@ class BuildahBuilder(Builder):
         tags = self.params.tags
         cmd = ["/usr/bin/buildah", "build-using-dockerfile"]
 
+        if not tags:
+            tags = self.generator.get_tags()
+
         if self.params.pull:
             cmd.append('--pull-always')
 
diff --git a/cekit/builders/podman.py b/cekit/builders/podman.py
index 5ccfdd2..1ac3bbe 100644
--- a/cekit/builders/podman.py
+++ b/cekit/builders/podman.py
@@ -30,6 +30,9 @@ class PodmanBuilder(Builder):
         tags = self.params.tags
         cmd = ["/usr/bin/podman", "build"]
 
+        if not tags:
+            tags = self.generator.get_tags()
+
         if self.params.pull:
             cmd.append('--pull-always')
 
diff --git a/cekit/generator/docker.py b/cekit/generator/docker.py
index 9b00e5b..ec6e701 100644
--- a/cekit/generator/docker.py
+++ b/cekit/generator/docker.py
@@ -48,12 +48,12 @@ class DockerGenerator(Generator):
         arch = platform.machine()
 
         if arch not in content_sets:
-            raise CekitError("There are no contet_sets defined for platform '{}'!".format(arch))
+            raise CekitError("There are no content_sets defined for platform '{}'!".format(arch))
 
         repos = ' '.join(content_sets[arch])
 
         try:
-            # idealy this will be API for ODCS, but there is no python3 package for ODCS
+            # ideally this will be API for ODCS, but there is no python3 package for ODCS
             cmd = ['/usr/bin/odcs']
 
             if config.get('common', 'redhat'):

Building images with Podman does not tag the resulting image
```
$ podman images
REPOSITORY                                                  TAG      IMAGE ID       CREATED          SIZE
<none>                                                      <none>   6fee3d0b86b6   37 seconds ago   253 MB
```
diff --git a/tests/test_builder.py b/tests/test_builder.py
index 86911b9..d45a40e 100644
--- a/tests/test_builder.py
+++ b/tests/test_builder.py
@@ -7,7 +7,9 @@ import time
 import pytest
 import yaml
 
+from cekit.descriptor import Image
 from cekit.errors import CekitError
+from cekit.generator.docker import DockerGenerator
 from cekit.tools import Map
 
 try:
@@ -572,3 +574,55 @@ def test_podman_builder_run_pull(mocker):
                                         '-t', 'foo',
                                         '-t', 'bar',
                                         'something/image'])
+
+
+def test_podman_builder_run_with_generator(mocker):
+    params = Map({'tags': []})
+    check_call = mocker.patch.object(subprocess, 'check_call')
+    builder = create_builder_object(mocker, 'podman', params)
+    builder.generator = DockerGenerator("", "", {})
+    builder.generator.image = Image(yaml.safe_load("""
+    name: foo
+    version: 1.9
+    labels:
+      - name: test
+        value: val1
+      - name: label2
+        value: val2
+    envs:
+      - name: env1
+        value: env1val
+    """), 'foo')
+    builder.run()
+
+    check_call.assert_called_once_with(['/usr/bin/podman',
+                                        'build',
+                                        '-t', 'foo:1.9',
+                                        '-t', 'foo:latest',
+                                        'something/image'])
+
+
+def test_buildah_builder_run_with_generator(mocker):
+    params = Map({'tags': []})
+    check_call = mocker.patch.object(subprocess, 'check_call')
+    builder = create_builder_object(mocker, 'buildah', params)
+    builder.generator = DockerGenerator("", "", {})
+    builder.generator.image = Image(yaml.safe_load("""
+    name: foo
+    version: 1.9
+    labels:
+      - name: test
+        value: val1
+      - name: label2
+        value: val2
+    envs:
+      - name: env1
+        value: env1val
+    """), 'foo')
+    builder.run()
+
+    check_call.assert_called_once_with(['/usr/bin/buildah',
+                                        'build-using-dockerfile',
+                                        '-t', 'foo:1.9',
+                                        '-t', 'foo:latest',
+                                        'something/image'])
diff --git a/tests/test_unit_generator_docker.py b/tests/test_unit_generator_docker.py
index b7fc8fe..dbf2d3f 100644
--- a/tests/test_unit_generator_docker.py
+++ b/tests/test_unit_generator_docker.py
@@ -98,7 +98,7 @@ def test_prepare_content_sets_should_fail_when_cs_are_note_defined_for_current_p
 
     with docker_generator(tmpdir) as generator:
         with cekit_config(redhat=True):
-            with pytest.raises(CekitError, match="There are no contet_sets defined for platform 'current_platform'!"):
+            with pytest.raises(CekitError, match="There are no content_sets defined for platform 'current_platform'!"):
                 assert generator._prepare_content_sets(
                     {'invalid_platform': ['ca1', 'cs2']}) is False
 
diff --git a/tests/test_validate.py b/tests/test_validate.py
index de50189..b2694b6 100644
--- a/tests/test_validate.py
+++ b/tests/test_validate.py
@@ -107,7 +107,7 @@ def run_cekit_cs_overrides(image_dir, mocker, overrides_descriptor):
 
 
 def test_content_sets_file_container_file(tmpdir, mocker, caplog):
-    # Do not try to validate dependencies while running tests, these are not neccessary
+    # Do not try to validate dependencies while running tests, these are not necessary
     mocker.patch('cekit.generator.docker.DockerGenerator.dependencies').return_value({})
     overrides_descriptor = {
         'schema_version': 1,
@@ -132,7 +132,7 @@ def test_content_sets_file_container_file(tmpdir, mocker, caplog):
 
 
 def test_content_sets_file_container_embedded(tmpdir, mocker, caplog):
-    # Do not try to validate dependencies while running tests, these are not neccessary
+    # Do not try to validate dependencies while running tests, these are not necessary
     mocker.patch('cekit.generator.docker.DockerGenerator.dependencies').return_value({})
     overrides_descriptor = {
         'schema_version': 1,
@@ -153,7 +153,7 @@ def test_content_sets_file_container_embedded(tmpdir, mocker, caplog):
 
 
 def test_content_sets_embedded_container_embedded(tmpdir, mocker, caplog):
-    # Do not try to validate dependencies while running tests, these are not neccessary
+    # Do not try to validate dependencies while running tests, these are not necessary
     mocker.patch('cekit.generator.docker.DockerGenerator.dependencies').return_value({})
     overrides_descriptor = {
         'schema_version': 1,
@@ -169,7 +169,7 @@ def test_content_sets_embedded_container_embedded(tmpdir, mocker, caplog):
 
 
 def test_content_sets_embedded_container_file(tmpdir, mocker, caplog):
-    # Do not try to validate dependencies while running tests, these are not neccessary
+    # Do not try to validate dependencies while running tests, these are not necessary
     mocker.patch('cekit.generator.docker.DockerGenerator.dependencies').return_value({})
     overrides_descriptor = {
         'schema_version': 1,

pip install -e .[dev]
parse_log_pytest
requirements.txt
docker>=5.0.0 pytest pytest-cov pytest-mock pykwalify
apt-get update apt-get install -y gcc
3.9
requirements.txt
pytest --no-header -rA --tb=line --color=no -p no:cacheprovider -W ignore::DeprecationWarning
-e git+https://github.com/cekit/cekit.git@aa3e124359eb089837ba3f026dfbc5a5068fed29#egg=cekit
certifi==2025.1.31
charset-normalizer==3.4.1
click==8.1.8
colorlog==6.9.0
coverage==7.8.0
docker==7.1.0
docopt==0.6.2
exceptiongroup==1.2.2
idna==3.10
iniconfig==2.1.0
Jinja2==3.1.6
MarkupSafe==3.0.2
packaging==24.2
pluggy==1.5.0
pykwalify==1.8.0
pytest==8.3.5
pytest-cov==6.0.0
pytest-mock==3.14.0
python-dateutil==2.9.0.post0
PyYAML==6.0.2
requests==2.32.3
ruamel.yaml==0.18.10
ruamel.yaml.clib==0.2.12
six==1.17.0
tomli==2.2.1
urllib3==2.3.0

name: cekit
channels:
  - defaults
  - https://repo.anaconda.com/pkgs/main
  - https://repo.anaconda.com/pkgs/r
  - conda-forge
dependencies:
  - _libgcc_mutex=0.1=main
  - _openmp_mutex=5.1=1_gnu
  - ca-certificates=2025.2.25=h06a4308_0
  - ld_impl_linux-64=2.40=h12ee557_0
  - libffi=3.4.4=h6a678d5_1
  - libgcc-ng=11.2.0=h1234567_1
  - libgomp=11.2.0=h1234567_1
  - libstdcxx-ng=11.2.0=h1234567_1
  - ncurses=6.4=h6a678d5_0
  - openssl=3.0.16=h5eee18b_0
  - pip=25.0=py39h06a4308_0
  - python=3.9.21=he870216_1
  - readline=8.2=h5eee18b_0
  - setuptools=75.8.0=py39h06a4308_0
  - sqlite=3.45.3=h5eee18b_0
  - tk=8.6.14=h39e8969_0
  - tzdata=2025a=h04d1e81_0
  - wheel=0.45.1=py39h06a4308_0
  - xz=5.6.4=h5eee18b_1
  - zlib=1.2.13=h5eee18b_1
  - pip:
      - certifi==2025.1.31
      - charset-normalizer==3.4.1
      - click==8.1.8
      - colorlog==6.9.0
      - coverage==7.8.0
      - docker==7.1.0
      - docopt==0.6.2
      - exceptiongroup==1.2.2
      - idna==3.10
      - iniconfig==2.1.0
      - jinja2==3.1.6
      - markupsafe==3.0.2
      - packaging==24.2
      - pluggy==1.5.0
      - pykwalify==1.8.0
      - pytest==8.3.5
      - pytest-cov==6.0.0
      - pytest-mock==3.14.0
      - python-dateutil==2.9.0.post0
      - pyyaml==6.0.2
      - requests==2.32.3
      - ruamel-yaml==0.18.10
      - ruamel-yaml-clib==0.2.12
      - six==1.17.0
      - tomli==2.2.1
      - urllib3==2.3.0
prefix: /opt/conda/envs/cekit

tests/test_builder.py::test_podman_builder_run_with_generator tests/test_builder.py::test_buildah_builder_run_with_generator tests/test_unit_generator_docker.py::test_prepare_content_sets_should_fail_when_cs_are_note_defined_for_current_platform
tests/test_builder.py::test_docker_squashing_parameters tests/test_validate.py::test_simple_image_build_no_docker_perm tests/test_validate.py::test_simple_image_build_no_docker_start
tests/test_builder.py::test_osbs_builder_defaults tests/test_builder.py::test_osbs_builder_redhat tests/test_builder.py::test_osbs_builder_use_rhpkg_stage tests/test_builder.py::test_osbs_builder_custom_commit_msg tests/test_builder.py::test_osbs_builder_nowait tests/test_builder.py::test_osbs_builder_user tests/test_builder.py::test_merge_container_yaml_no_limit_arch tests/test_builder.py::test_merge_container_yaml_limit_arch tests/test_builder.py::test_osbs_builder_run_brew_stage tests/test_builder.py::test_osbs_builder_run_brew tests/test_builder.py::test_osbs_builder_run_koji tests/test_builder.py::test_osbs_builder_run_brew_nowait tests/test_builder.py::test_osbs_builder_run_brew_user tests/test_builder.py::test_osbs_builder_run_brew_target tests/test_builder.py::test_osbs_wait_for_osbs_task_finished_successfully tests/test_builder.py::test_osbs_wait_for_osbs_task_in_progress tests/test_builder.py::test_osbs_wait_for_osbs_task_failed tests/test_builder.py::test_osbs_copy_artifacts_to_dist_git[artifact0-image/some-path.jar-osbs/repo/some-path.jar] tests/test_builder.py::test_osbs_copy_artifacts_to_dist_git[artifact1-image/some-name-osbs/repo/some-name] tests/test_builder.py::test_osbs_copy_artifacts_to_dist_git[artifact2-image/some-target.jar-osbs/repo/some-target.jar] tests/test_builder.py::test_osbs_copy_artifacts_to_dist_git[artifact3-image/some-name-osbs/repo/some-name] tests/test_builder.py::test_osbs_copy_artifacts_to_dist_git[artifact4-image/some-target.jar-osbs/repo/some-target.jar] tests/test_builder.py::test_docker_builder_defaults tests/test_builder.py::test_docker_squashing_enabled tests/test_builder.py::test_docker_squashing_disabled tests/test_builder.py::test_buildah_builder_run tests/test_builder.py::test_buildah_builder_run_pull tests/test_builder.py::test_podman_builder_run tests/test_builder.py::test_podman_builder_run_pull tests/test_unit_generator_docker.py::test_prepare_content_sets_should_return_early_when_redhat_is_not_set tests/test_unit_generator_docker.py::test_prepare_content_sets_should_not_fail_when_cs_is_none tests/test_unit_generator_docker.py::test_prepare_content_sets_should_not_fail_when_cs_is_empty tests/test_unit_generator_docker.py::test_prepare_content_sets_should_request_odcs tests/test_unit_generator_docker.py::test_prepare_content_sets_should_request_odcs_with_hidden_repos_flag tests/test_unit_generator_docker.py::test_prepare_content_sets_should_handle_incorrect_state tests/test_unit_generator_docker.py::test_prepare_content_sets_should_handle_no_odcs_command tests/test_validate.py::test_content_sets_file_container_file tests/test_validate.py::test_content_sets_file_container_embedded tests/test_validate.py::test_content_sets_embedded_container_embedded tests/test_validate.py::test_content_sets_embedded_container_file tests/test_validate.py::test_simple_image_build tests/test_validate.py::test_simple_image_test tests/test_validate.py::test_image_generate_with_multiple_overrides tests/test_validate.py::test_image_test_with_override tests/test_validate.py::test_image_test_with_multiple_overrides tests/test_validate.py::test_image_test_with_override_on_cmd tests/test_validate.py::test_module_override tests/test_validate.py::test_local_module_not_injected tests/test_validate.py::test_run_override_user tests/test_validate.py::test_run_override_artifact tests/test_validate.py::test_run_path_artifact_brew tests/test_validate.py::test_run_path_artifact_target tests/test_validate.py::test_execution_order tests/test_validate.py::test_override_modules_child tests/test_validate.py::test_override_modules_flat tests/test_validate.py::test_execution_order_flat tests/test_validate.py::test_package_related_commands_packages_in_module tests/test_validate.py::test_package_related_commands_packages_in_image tests/test_validate.py::test_nonexisting_image_descriptor tests/test_validate.py::test_nonexisting_override_file tests/test_validate.py::test_incorrect_override_file
cekit/builders/podman.py cekit/builders/buildah.py cekit/generator/docker.py
cekit/builders/podman.py cekit/builders/buildah.py cekit/generator/docker.py