Skip to content

Commit db0daa1

Browse files
authored
Merge pull request #322 from jajik/docker
Use Containerfile naming, tweak & polish these, clean up unused files
2 parents 0862b2d + d9f21a1 commit db0daa1

8 files changed

Lines changed: 3 additions & 231 deletions

File tree

test/MODCLUSTER-755/Dockerfile

Lines changed: 0 additions & 14 deletions
This file was deleted.

test/MODCLUSTER-755/Makefile

Lines changed: 0 additions & 7 deletions
This file was deleted.

test/MODCLUSTER-755/addwebapp.sh

Lines changed: 0 additions & 13 deletions
This file was deleted.

test/MODCLUSTER-755/files/index.html

Lines changed: 0 additions & 1 deletion
This file was deleted.

test/MODCLUSTER-755/files/server.xml

Lines changed: 0 additions & 173 deletions
This file was deleted.

test/MODCLUSTER-755/files/start.sh

Lines changed: 0 additions & 18 deletions
This file was deleted.
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
ARG HTTPD_SOURCES="https://dlcdn.apache.org/httpd/httpd-2.4.63.tar.gz"
1+
FROM fedora:41
22

3-
FROM fedora:40
3+
ARG HTTPD_SOURCES="https://dlcdn.apache.org/httpd/httpd-2.4.63.tar.gz"
44

55
RUN yum install gcc wget apr-devel apr-util-devel openssl-devel pcre-devel redhat-rpm-config wcstools git autoconf -y
66

7-
ARG HTTPD_SOURCES
8-
97
ENV CONF=httpd/mod_proxy_cluster.conf
108
ENV HTTPD=${HTTPD_SOURCES}
119

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ARG TESTSUITE_TOMCAT_CONFIG=server.xml
66
ARG TESTSUITE_TOMCAT_CONTEXT=context.xml
77

88
# install ss
9-
RUN apt update && apt install -y iproute2
9+
RUN apt-get update && apt-get install -y iproute2
1010

1111
WORKDIR /usr/local/tomcat
1212

0 commit comments

Comments
 (0)