Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 12 additions & 23 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest AS manifest
FROM registry.access.redhat.com/ubi10/ubi-minimal:latest AS manifest

COPY .git /tmp/.git

Expand All @@ -7,7 +7,7 @@ RUN cd /tmp && \
if [[ "$(cat .git/HEAD)" == "ref:"* ]]; then sha=$(cat .git/$sha); fi && \
echo "$(date +"%Y%m%d%H%M%S")-$sha" > /tmp/BUILD

FROM registry.access.redhat.com/ubi9/ubi-init
FROM registry.access.redhat.com/ubi10/ubi-init
MAINTAINER ManageIQ https://github.com/ManageIQ/container-httpd

ARG DBUS_API_REF=master
Expand All @@ -18,53 +18,42 @@ LABEL name="auth-httpd" \
summary="httpd image with external authentication" \
description="An httpd image which includes packages and configuration necessary for handling external authentication."

RUN ARCH=$(uname -m) && \
dnf -y --disableplugin=subscription-manager --setopt=tsflags=nodocs install \
RUN --mount=type=bind,from=quay.io/manageiq/build_tools:v1,source=/tools,target=/usr/local/bin \
miq_switch_to_centos_stream_10 && \
miq_enable_epel && \
dnf -y --setopt=tsflags=nodocs install \
httpd \
mod_ssl \
ruby \
# Apache External Authentication Module Packages \
mod_auth_gssapi \
mod_auth_mellon \
mod_auth_openidc \
mod_authnz_pam \
mod_intercept_form_submit \
mod_lookup_identity \
mod_auth_mellon && \
dnf -y --setopt=protected_packages= remove redhat-release && \
dnf -y remove *subscription-manager* && \
dnf -y --setopt=tsflags=nodocs install \
http://mirror.stream.centos.org/9-stream/BaseOS/${ARCH}/os/Packages/centos-stream-release-9.0-34.el9.noarch.rpm \
http://mirror.stream.centos.org/9-stream/BaseOS/${ARCH}/os/Packages/centos-stream-repos-9.0-34.el9.noarch.rpm \
http://mirror.stream.centos.org/9-stream/BaseOS/${ARCH}/os/Packages/centos-gpg-keys-9.0-34.el9.noarch.rpm && \
dnf -y --disableplugin=subscription-manager --setopt=tsflags=nodocs install \
# IPA External Authentication Packages \
c-ares \
certmonger \
ipa-client \
ipa-admintools \
ipa-client \
# SSSD Packages \
sssd \
sssd-dbus \
# Apache External Authentication Module Packages \
mod_auth_openidc \
# Active Directory External Authentication Packages \
adcli \
realmd \
oddjob \
oddjob-mkhomedir \
realmd \
samba-common \
samba-common-tools && \
dnf clean all && \
rm -rf /var/cache/dnf
miq_clean_dnf_rpm

## Remove any existing configurations
RUN rm -f /etc/httpd/conf.d/* && \
sed -i 's+ErrorLog "logs/error_log"+ErrorLog "/dev/stderr"+g' /etc/httpd/conf/httpd.conf && \
sed -i 's+CustomLog "logs/access_log" combined+CustomLog "/dev/stdout" combined+g' /etc/httpd/conf/httpd.conf

RUN dnf -y --disableplugin=subscription-manager --setopt=tsflags=nodocs install \
ruby && \
dnf clean all && \
rm -rf /var/cache/dnf

## Install DBus API Service
ENV HTTPD_DBUS_API_SERVICE_DIRECTORY=/opt/dbus_api_service
ENV HTTPD_DBUS_API_SERVICE_PORT=8081
Expand Down