Skip to content

Commit 62af3dd

Browse files
committed
chore: clean docker image
1 parent a62b887 commit 62af3dd

File tree

2 files changed

+2
-15
lines changed

2 files changed

+2
-15
lines changed

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,3 @@ down:
1616
clean:
1717
docker kill $$(docker ps -q) 2> /dev/null || true
1818
docker system prune -a
19-
docker volume rm $(docker volume ls -qf dangling=true)

tests/test.sh

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ finish() {
160160
fi
161161

162162
p "Cleaning up Docker compose environment"
163-
compose stop
164-
compose rm -f
163+
docker kill nginx_aws_signature_test 2> /dev/null || true
164+
docker rmi nginx_aws_signature_test 2> /dev/null || true
165165

166166
exit ${result}
167167
}
@@ -172,18 +172,6 @@ trap finish EXIT ERR SIGTERM SIGINT
172172
p "Building NGINX AWS Signature Lib Test Docker image"
173173
docker-compose -f ${test_compose_config} up -d
174174

175-
if [ ${njs_latest} -eq 1 ]; then
176-
p "Layering in latest NJS build"
177-
docker build -f docker/Dockerfile.latest-njs \
178-
--tag nginx_aws_signature_test --tag nginx_aws_signature_test:latest-njs-${nginx_type} .
179-
fi
180-
181-
if [ ${unprivileged} -eq 1 ]; then
182-
p "Layering in unprivileged build"
183-
docker build -f docker/Dockerfile.unprivileged \
184-
--tag nginx_aws_signature_test --tag nginx_aws_signature_test:unprivileged-${nginx_type} .
185-
fi
186-
187175
### UNIT TESTS
188176

189177
runUnitTestWithOutSessionToken() {

0 commit comments

Comments
 (0)