Merge pull request #332 from jajik/polish-containerfile

test: Tweak test containers, reduce size

Author: rhusar

test/httpd/Containerfile

@@ -1,22 +1,22 @@
-FROM fedora:41
+FROM fedora:41 AS builder
 
 ARG HTTPD_SOURCES="https://dlcdn.apache.org/httpd/httpd-2.4.63.tar.gz"
 
-RUN yum install gcc wget apr-devel apr-util-devel openssl-devel pcre-devel redhat-rpm-config wcstools git autoconf -y
+RUN dnf install gcc apr-devel apr-util-devel openssl-devel pcre-devel redhat-rpm-config autoconf wcstools -y
 
 ENV CONF=httpd/mod_proxy_cluster.conf
 ENV HTTPD=${HTTPD_SOURCES}
 
 # make sure you have copy of the local repository at place
 # (our function "httpd_create" takes care of that)
-ADD mod_proxy_cluster /
-ADD run.sh /tmp
+COPY mod_proxy_cluster /
+
+ADD ${HTTPD} .
+
+RUN mkdir /httpd && tar xvf $(filename $HTTPD) --strip 1 -C /httpd
 
-RUN wget $HTTPD
-RUN mkdir httpd
-RUN tar xvf $(filename $HTTPD) --strip 1 -C httpd
-RUN ls
 WORKDIR /httpd
+
 RUN ./configure --enable-proxy \
                 --enable-proxy-http \
                 --enable-proxy-ajp \
@@ -41,6 +41,18 @@ RUN for m in advertise mod_proxy_cluster balancers mod_manager; \
         cd $OLDPWD; \
     done;
 
+RUN rm -rf /test/httpd/mod_proxy_cluster
+
+FROM fedora:41
+
+RUN dnf install pcre apr-util wcstools -y
+
+COPY --from=builder /usr/local/apache2 /usr/local/apache2
+
+COPY --from=builder /test /test
+
+COPY run.sh /tmp
+
 WORKDIR /usr/local/apache2
 
 CMD /tmp/run.sh

test/httpd/run.sh

@@ -1,9 +1,6 @@
 #!/bin/sh
 
-pwd
-ls -lt
-
-# wget and copy the prepared conf file and include it
+# copy the prepared conf file and include it
 cd /test/
 if [ -f $CONF ]; then
   FILECONF=$(filename $CONF)

test/tomcat/Containerfile

@@ -14,8 +14,7 @@ COPY target/*.jar ./lib/
 
 COPY $TESTSUITE_TOMCAT_CONFIG  ./conf/server.xml
 COPY $TESTSUITE_TOMCAT_CONTEXT ./conf/context.xml
-COPY start.sh ./
-RUN chmod +x start.sh
+COPY --chmod=755 start.sh ./
 
 ENV cluster_port=6666
 ENV cluster_address=127.0.0.1