switch base

1 files changed, 4 insertions, 14 deletions

diff --git a/Dockerfile b/Dockerfile
index b71e739..6100be3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM centos:8
+FROM kraxel/s2i-base-httpd
 
 ENV SUMMARY="virtio spec" \
     DESCRIPTION="Platform for building virtio specification (centos8)"
@@ -8,13 +8,11 @@ LABEL maintainer="Gerd Hoffmann <kraxel@redhat.com>" \
       description="${DESCRIPTION}" \
       io.k8s.display-name="${SUMMARY}" \
       io.k8s.description="${DESCRIPTION}" \
-      io.openshift.expose-services="8080:http" \
       io.openshift.tags="virtio" \
-      io.openshift.s2i.scripts-url="image:///usr/libexec/s2i"
 
 USER root
 
-RUN dnf update -y; \
+RUN dnf update -y && \
     dnf install -y liberation-fonts \
                    texlive-amsfonts \
                    texlive-cm \
@@ -66,20 +64,12 @@ RUN dnf update -y; \
 		   'tex(xltxtra.sty)' \
 		   'tex(xstring.sty)' \
 		   \
-                   zip git file httpd; \
+                   zip git file && \
     dnf clean all -y
 
 COPY ./s2i/bin/ /usr/libexec/s2i
-COPY ./etc/virtio-spec-documentroot.conf /etc/httpd/conf.d/
-RUN mkdir -p /opt/app-root;\
-    chmod 755 /opt /opt/app-root;\
-    useradd -d /opt/app-root/src -u 1001 default;\
-    mkdir -p /run/httpd;\
-    chmod 777 /run/httpd /etc/httpd/logs;\
-    sed -i -e '/Listen/s/^/#/' /etc/httpd/conf/httpd.conf;\
-    rm -f /etc/httpd/conf.d/welcome.conf
+COPY ./etc/*.conf /etc/httpd/conf.d/
 
 USER 1001
-EXPOSE 8080
 
 CMD ["/usr/libexec/s2i/usage"]