Skip to content

test: Update *_create functions to use Containerfile explicitly #323

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rhusar merged 1 commit into from
Feb 25, 2025
Merged

test: Update *_create functions to use Containerfile explicitly #323

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions test/includes/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ httpd_create() {
done
cp -r ../native ../test /tmp/mod_proxy_cluster/
mv /tmp/mod_proxy_cluster httpd/
docker build -t $HTTPD_IMG httpd/
docker build -t $HTTPD_IMG -f httpd/Containerfile httpd/
}

# Build and run httpd container
Expand Down Expand Up @@ -113,10 +113,12 @@ clean_and_exit() {
# $3 tomcat context file (default is context.xml)
tomcat_create() {
if [ -z "$1" ]; then
docker build -t $IMG tomcat/ --build-arg TESTSUITE_TOMCAT_CONFIG=${2:-server.xml} \
docker build -t $IMG -f tomcat/Containerfile tomcat/ \
--build-arg TESTSUITE_TOMCAT_CONFIG=${2:-server.xml} \
--build-arg TESTSUITE_TOMCAT_CONTEXT=${3:-context.xml}
else
docker build -t $IMG tomcat/ --build-arg TESTSUITE_TOMCAT_VERSION=$1 \
docker build -t $IMG -f tomcat/Containerfile tomcat/ \
--build-arg TESTSUITE_TOMCAT_VERSION=$1 \
--build-arg TESTSUITE_TOMCAT_CONFIG=${2:-server.xml} \
--build-arg TESTSUITE_TOMCAT_CONTEXT=${3:-context.xml}
fi
Expand Down