Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Polish docker/podman images #3494

Merged
merged 8 commits into from
Feb 6, 2025
Merged

Polish docker/podman images #3494

merged 8 commits into from
Feb 6, 2025

Conversation

happz
Copy link
Collaborator

@happz happz commented Jan 28, 2025

After the question about indentation in containerfiles has been raised several times, it's time to do something about it. And can't stop with just one issue, so touching several parts of the image building process:

  • adding a linter to pre-commit for containerimages, and fixing issues reported by it.
  • using heredoc + RUN instead of often weirdly aligned multiline RUN.
  • renamed make targets: images, images/test, images/test/bases, clean, clean/images, clean/images/test
  • renamed images as well, to have a nice namespace for container images and regular container images, not the test ones, etc.: tmt/container/tmt-all, tmt/container/tmt, tmt/container/test/alpine, ...
  • simplified coe building images in Makefile to use same path for both test and tmt images.

Pull Request Checklist

  • implement the feature

@happz happz added the ci | full test Pull request is ready for the full test execution label Jan 28, 2025
@happz happz added this to the 1.43 milestone Jan 28, 2025
@happz happz force-pushed the containers-refurbished branch from 088c76c to f7c6de7 Compare February 4, 2025 11:59
happz added 3 commits February 5, 2025 14:02
After the question about indentation in containerfiles has been raised
several times, it's time to do something about it. And can't stop with
just one issue, so touching several parts of the image building process:

* adding a linter to pre-commit for containerimages, and fixing issues
  reported by it.
* using heredoc + `RUN` instead of often weirdly aligned multiline
  `RUN`.
* renamed `make` targets: `images`, `images/test`, `images/test/bases`,
  `clean`, `clean/images`, `clean/images/test`
* renamed images as well, to have a nice namespace for container images
  and regular container images, not the test ones, etc.:
  `tmt/container/tmt-all`, `tmt/container/tmt`, `tmt/container/test/alpine`,
  ...
* simplified coe building images in `Makefile` to use same path for both
  test and tmt images.
@happz happz force-pushed the containers-refurbished branch from f7c6de7 to 83d7a00 Compare February 5, 2025 13:02
@psss psss changed the title Polishing docker/podman images Polish docker/podman images Feb 5, 2025
Copy link
Collaborator

@psss psss left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the cleanup! Looks good. Just a few comments.

docs/contribute.rst Outdated Show resolved Hide resolved
containers/fedora/39/Containerfile Show resolved Hide resolved
containers/Containerfile.full Show resolved Hide resolved
Makefile Outdated Show resolved Hide resolved
@happz happz merged commit 4aa1764 into main Feb 6, 2025
21 of 22 checks passed
@happz happz deleted the containers-refurbished branch February 6, 2025 11:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci | full test Pull request is ready for the full test execution
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants