Skip to content
Permalink
Browse files

Move smoke test into root folder to avoid permission trouble

  • Loading branch information...
bkimminich committed Aug 27, 2019
1 parent 7de2f6a commit 0b6cb5ae64a7a1839a7a2700d66ca32d592053df
Showing with 9 additions and 12 deletions.
  1. +0 −2 .dockerignore
  2. +0 −1 Dockerfile
  3. +1 −1 docker-compose.test.yml
  4. +8 −0 smokeTest.sh
  5. +0 −8 test/dockerSmokeTests.sh
@@ -11,5 +11,3 @@ Dockerfile
# Pattern is *not covered* by node_modules/ above no matter what IntelliJ says!
frontend/node_modules/
frontend/dist/

!test/dockerSmokeTests.sh
@@ -25,7 +25,6 @@ RUN addgroup juicer && \
COPY --from=installer --chown=juicer /juice-shop .
RUN mkdir logs && \
chown -R juicer logs && \
chown -R juicer test && \
chgrp -R 0 ftp/ frontend/dist/ logs/ data/ && \
chmod -R g=u ftp/ frontend/dist/ logs/ data/
USER juicer
@@ -1,3 +1,3 @@
sut:
build: .
command: ./test/dockerSmokeTests.sh
command: smokeTest.sh
@@ -0,0 +1,8 @@
sleep 5
if curl http://localhost:3000 | grep -q '<app-root></app-root>'; then
echo -e "\e[42mSmoke test passed!\e[0m"
exit 0
else
echo -e "\e[31mSmoke test failed!\e[0m"
exit 1
fi

This file was deleted.

0 comments on commit 0b6cb5a

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