Skip to content
Permalink
Browse files

Merge pull request #1429 from ptrovatelli/fix-unit-test-docker-env

Fix #1428: unit-tests not working in docker env
  • Loading branch information...
devGregA committed Jul 31, 2019
2 parents 7a9037d + b052480 commit a6983f5742171d254e2b3459388824adfe9e0ac8
Showing with 7 additions and 2 deletions.
  1. +2 −0 Dockerfile.busybox
  2. +1 −0 Dockerfile.django
  3. +4 −2 docker-compose.override.unit_tests.yml
@@ -0,0 +1,2 @@
FROM busybox:1.31.0-musl
ENTRYPOINT ["/bin/echo", "hello world"]
@@ -61,6 +61,7 @@ COPY \
docker/entrypoint-uwsgi.sh \
docker/entrypoint-uwsgi-dev.sh \
docker/entrypoint-unit-tests.sh \
docker/entrypoint-unit-tests-devDocker.sh \
docker/wait-for-it.sh \
/
COPY wsgi.py manage.py tests/unit-tests.sh ./
@@ -2,8 +2,10 @@
version: '3.7'
services:
nginx:
image: hello-world
entrypoint: []
build:
context: ./
dockerfile: Dockerfile.busybox
image: defectdojo/defectdojo-busybox:${NGINX_VERSION:-latest}
uwsgi:
entrypoint: ['/wait-for-it.sh', 'mysql:3306', '-t', '30', '--', '/entrypoint-unit-tests-devDocker.sh']
volumes:

0 comments on commit a6983f5

Please sign in to comment.
You can’t perform that action at this time.