Skip to content

Commit

Permalink
Let's just look in the logs and don't be cute.
Browse files Browse the repository at this point in the history
  • Loading branch information
adamdoupe committed Sep 1, 2023
1 parent 3252a3f commit 0da389b
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 4 deletions.
1 change: 1 addition & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ jobs:
until docker exec dojo dojo is-setup-finished
do
sleep 1
docker exec dojo journalctl -u pwn.college | tail -n 10
done
- name: Run tests against container
run: "pytest ./test"
Expand Down
3 changes: 0 additions & 3 deletions script/container-setup.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#!/bin/sh

DOJO_DIR=/opt/pwn.college
SETUP_DONE_LOCATION_CHECK=/tmp/container-setup-done
rm -f "$SETUP_DONE_LOCATION_CHECK"

>> $DOJO_DIR/data/config.env

Expand Down Expand Up @@ -85,4 +83,3 @@ for host in $(cat $DOJO_DIR/user_firewall.allowed); do
iptables -I DOCKER-USER -i user_firewall -d $(host $host | awk '{print $NF; exit}') -j ACCEPT
done

touch "$SETUP_DONE_LOCATION_CHECK"
2 changes: 1 addition & 1 deletion script/dojo
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ case "$ACTION" in

# HELP: is-setup-finished: use exit code to return if the system is done with setup
"is-setup-finished")
[ -f /tmp/container-setup-done ] && journalctl -u pwn.college | grep "Finished pwn.college docker compose service"
journalctl -u pwn.college | grep "Finished pwn.college docker compose service"
;;

# HELP: start: start the dojo. Main entry point for the docker image.
Expand Down

0 comments on commit 0da389b

Please sign in to comment.