File tree Expand file tree Collapse file tree 2 files changed +2
-15
lines changed Expand file tree Collapse file tree 2 files changed +2
-15
lines changed Original file line number Diff line number Diff line change 16
16
clean :
17
17
docker kill $$(docker ps -q ) 2> /dev/null || true
18
18
docker system prune -a
19
- docker volume rm $(docker volume ls -qf dangling=true )
Original file line number Diff line number Diff line change @@ -160,8 +160,8 @@ finish() {
160
160
fi
161
161
162
162
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
165
165
166
166
exit ${result}
167
167
}
@@ -172,18 +172,6 @@ trap finish EXIT ERR SIGTERM SIGINT
172
172
p " Building NGINX AWS Signature Lib Test Docker image"
173
173
docker-compose -f ${test_compose_config} up -d
174
174
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
-
187
175
# ## UNIT TESTS
188
176
189
177
runUnitTestWithOutSessionToken () {
You can’t perform that action at this time.
0 commit comments