Ensure latest samba is installed #956
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Stay up to date in case older versions are purged from the repo.
This will allow for newer samba packages
Fryguy
reviewed
Apr 12, 2023
| dnf config-manager --setopt=appstream*.exclude=*httpd*,mod_ssl --save \ | ||
| ; fi && \ | ||
| dnf -y install \ | ||
| https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm \ | ||
| https://rpm.manageiq.org/release/17-quinteros/el8/noarch/manageiq-release-17.0-1.el8.noarch.rpm && \ | ||
| dnf -y update && \ |
There was a problem hiding this comment.
@bdunne can we do this on the appliance side as well to keep it consistent?
There was a problem hiding this comment.
This shouldn't be necessary on the appliances since the installer will pick the latest available at installation time. We only need this because there may be changes since the base image was created.
|
I narrowed it down here ManageIQ/manageiq-rpm_build#281 (comment) |
|
@bdunne A conflict occurred during the backport of this pull request to If this pull request is based on another pull request that has not been marked for backport, add the appropriate labels to the other pull request. Otherwise, please create a new pull request direct to the Conflict details: diff --cc images/manageiq-base/Dockerfile
index 069ea53,cf417c9..0000000
--- a/images/manageiq-base/Dockerfile
+++ b/images/manageiq-base/Dockerfile
@@@ -46,9 -48,10 +48,14 @@@ RUN dnf config-manager --setopt=tsflags
; fi && \
dnf -y install \
https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm \
++<<<<<<< HEAD
+ https://rpm.manageiq.org/release/16-petrosian/el8/noarch/manageiq-release-16.0-1.el8.noarch.rpm && \
++=======
+ https://rpm.manageiq.org/release/17-quinteros/el8/noarch/manageiq-release-17.0-1.el8.noarch.rpm && \
+ dnf -y update && \
++>>>>>>> 1e331e5 (Merge pull request #956 from bdunne/ensure_latest_samba)
dnf -y module enable postgresql:13 ruby:3.0 && \
- if [[ "$RELEASE_BUILD" != "true" ]]; then dnf config-manager --enable manageiq-17-quinteros-nightly; fi && \
+ if [[ "$RELEASE_BUILD" != "true" ]]; then dnf config-manager --enable manageiq-16-petrosian-nightly; fi && \
dnf config-manager --setopt=ubi-8-*.exclude=dracut*,net-snmp*,perl-*,redhat-release* --save && \
if [[ "$LOCAL_RPM" = "true" ]]; then /create_local_yum_repo.sh; fi && \
dnf -y install \ |
bdunne
pushed a commit
that referenced
this pull request
Apr 26, 2023
Ensure latest samba is installed (cherry picked from commit 1e331e5)
|
Backported to petrosian via 6665e6b |
bdunne
added a commit
to bdunne/manageiq-pods
that referenced
this pull request
Apr 27, 2023
httpd will still come from the UBI appstream repo due to the exclusion set above. When the release RPM is swapped, the RPM scripts from that and shadow-utils reset the contents of /etc/passwd causing the apache user to be removed and httpd fails to start due to the missing user. Based on changes in ManageIQ#956
bdunne
added a commit
to bdunne/manageiq-pods
that referenced
this pull request
Apr 27, 2023
httpd will still come from the UBI appstream repo due to the exclusion set above. When the release RPM is swapped, the RPM scripts from that and shadow-utils reset the contents of /etc/passwd causing the apache user to be removed and httpd fails to start due to the missing user. Based on changes in ManageIQ#956
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
dnf updatesystem packages to allow for newer packages to be installed (samba-*) later in the dockerfileThis brings samba packages up to date: