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

Remove the pattern in the server container image #9579

Closed
wants to merge 2 commits into from

Conversation

cbosdo
Copy link
Contributor

@cbosdo cbosdo commented Dec 16, 2024

What does this PR change?

The pattern is yet another level to aggregate packages and is no longer required with containers. Move them all into the Dockerfile.

Some packages for SUSE Manager only or architecture specific will need to come from the OBS project configuration EXTRAPACKAGES though.

GUI diff

No difference.

  • DONE

Documentation

  • No documentation needed: only internal and user invisible changes

  • DONE

Test coverage

  • No tests: dockerfile is not really tested

  • DONE

Links

Issue(s): #
Port(s): # add downstream PR(s), if any

  • DONE

Changelogs

Make sure the changelogs entries you are adding are compliant with https://github.com/uyuni-project/uyuni/wiki/Contributing#changelogs and https://github.com/uyuni-project/uyuni/wiki/Contributing#uyuni-projectuyuni-repository

If you don't need a changelog check, please mark this checkbox:

  • No changelog needed

If you uncheck the checkbox after the PR is created, you will need to re-run changelog_test (see below)

Re-run a test

If you need to re-run a test, please mark the related checkbox, it will be unchecked automatically once it has re-run:

  • Re-run test "changelog_test"
  • Re-run test "backend_unittests_pgsql"
  • Re-run test "java_pgsql_tests"
  • Re-run test "schema_migration_test_pgsql"
  • Re-run test "susemanager_unittests"
  • Re-run test "javascript_lint"
  • Re-run test "spacecmd_unittests"

Before you merge

Check How to branch and merge properly!

@cbosdo
Copy link
Contributor Author

cbosdo commented Dec 16, 2024

Note that the OBS project configs will adjustments:

  • PRODUCT_PATTERN_PREFIX can be dropped
  • susemanager-branding-oss needs to be added to EXTRAPACKAGES variable for SUSE Manager
  • syslinux-x86_64 needs to be added to EXTRAPACKAGES variable for non x86_64 and syslinux for x86_64.

containers/server-image/Dockerfile Outdated Show resolved Hide resolved
srbarrios
srbarrios previously approved these changes Dec 17, 2024
srbarrios
srbarrios previously approved these changes Dec 17, 2024
@cbosdo
Copy link
Contributor Author

cbosdo commented Dec 17, 2024

Here is the prjconf setting up the EXTRAPACKAGES for Uyuni:

%ifarch x86_64
BuildFlags: dockerarg:EXTRAPACKAGES=shim%20syslinux
%else
%ifarch aarch64
BuildFlags: dockerarg:EXTRAPACKAGES=shim%20syslinux-x86_64
%else
BuildFlags: dockerarg:EXTRAPACKAGES=syslinux-x86_64
%endif
%endif

@cbosdo cbosdo requested a review from deneb-alpha December 17, 2024 09:16
The pattern is yet another level to aggregate packages and is no longer
required with containers. Move them all into the Dockerfile.

Some packages for SUSE Manager only or architecture specific will need
to come from the OBS project configuration EXTRAPACKAGES though.
OBS fails to handle multiple packages in the EXTRAPACKAGES variable,
with kiwi those architecture dependent packages are defined in the git
tree.
@cbosdo
Copy link
Contributor Author

cbosdo commented Dec 18, 2024

OBS fails to understand the list of packages from the EXTRAPACKAGES value and only downloads the first one. The image build then breaks because the other packages are not available.
In order to work around this I tried building the image with Kiwi, but this requires tito to be patched: https://build.opensuse.org/requests/1231896. Note that I haven't tested the tito tagging with that SR yet.

@cbosdo
Copy link
Contributor Author

cbosdo commented Dec 18, 2024

The original issue I wanted to fix with this PR can be solved with https://build.opensuse.org/requests/1231890. I'm not sure we need this one in the end.

@cbosdo cbosdo requested review from a team as code owners December 18, 2024 18:00
@cbosdo cbosdo requested review from m-czernek and removed request for a team December 18, 2024 18:00
@cbosdo cbosdo closed this Jan 20, 2025
@cbosdo cbosdo deleted the pattern-removal branch January 20, 2025 13:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants