From d88c1551a616d9234f9b3b7ce64deeb3b2addf45 Mon Sep 17 00:00:00 2001 From: Chris Carmichael Date: Sat, 2 May 2020 10:48:23 -0600 Subject: [PATCH 1/6] fix readme --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 4d583ab..f7f951c 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ # Welcome to your course 🎉 -boo ### Getting started From a83b2d8c1128dc3163a40cd08c34f090aa61cfd2 Mon Sep 17 00:00:00 2001 From: Chris Carmichael Date: Sat, 2 May 2020 11:08:07 -0600 Subject: [PATCH 2/6] boo --- scripts/invalid-docker-ports.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/invalid-docker-ports.sh b/scripts/invalid-docker-ports.sh index 19c3f59..9e7bc2d 100755 --- a/scripts/invalid-docker-ports.sh +++ b/scripts/invalid-docker-ports.sh @@ -10,9 +10,9 @@ done | sed 's/^"//g' | sed 's/^-//g' | sed '/^$/d' | sed 's/:.*//') # check range of ports for restricted range for port in `echo ${exposed_ports} | sed 's/ /\n/g'` do - #if [ ${port} >= 20000 && ${port} <= 36384 ]; then - #if (( ${port} >= 20000 && ${port} <= 36384 )); then - if (( ${port} >= 20000 && ${port} <= 41333 )); then + if (( ${port} >= 20000 && ${port} <= 36384 )); then + # make it fail: + #if (( ${port} >= 20000 && ${port} <= 41333 )); then echo "${port} is in a restricted range for Hyper-V" exit 1 fi From 29da4eabd5a882fa344684974130d1a3a3202aef Mon Sep 17 00:00:00 2001 From: Chris Carmichael Date: Fri, 8 May 2020 07:11:49 -0600 Subject: [PATCH 3/6] boo --- .github/workflows/local-dev-check.yml | 3 +++ local_dev/docker-compose.yml | 1 + 2 files changed, 4 insertions(+) diff --git a/.github/workflows/local-dev-check.yml b/.github/workflows/local-dev-check.yml index 079d921..453e5c4 100644 --- a/.github/workflows/local-dev-check.yml +++ b/.github/workflows/local-dev-check.yml @@ -14,4 +14,7 @@ jobs: - name: check-content run: | + # download yq + curl https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o yq + chmod +x ./yq ./scripts/invalid-docker-ports.sh diff --git a/local_dev/docker-compose.yml b/local_dev/docker-compose.yml index d5a7b03..46abc76 100644 --- a/local_dev/docker-compose.yml +++ b/local_dev/docker-compose.yml @@ -1,5 +1,6 @@ # Important: We should avoid exposing any ports between `20000` and `36384` # see here for reasons why: https://github.com/logrhythm/boreas/tree/master/documentation/troubleshooting +# boo version: '3.7' volumes: From 57965381bf3506000952cd4fb9e040e56e57f383 Mon Sep 17 00:00:00 2001 From: Chris Carmichael Date: Fri, 8 May 2020 07:12:52 -0600 Subject: [PATCH 4/6] boo --- scripts/invalid-docker-ports.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/invalid-docker-ports.sh b/scripts/invalid-docker-ports.sh index 9e7bc2d..0c2a56c 100755 --- a/scripts/invalid-docker-ports.sh +++ b/scripts/invalid-docker-ports.sh @@ -10,9 +10,9 @@ done | sed 's/^"//g' | sed 's/^-//g' | sed '/^$/d' | sed 's/:.*//') # check range of ports for restricted range for port in `echo ${exposed_ports} | sed 's/ /\n/g'` do - if (( ${port} >= 20000 && ${port} <= 36384 )); then + #if (( ${port} >= 20000 && ${port} <= 36384 )); then # make it fail: - #if (( ${port} >= 20000 && ${port} <= 41333 )); then + if (( ${port} >= 20000 && ${port} <= 41333 )); then echo "${port} is in a restricted range for Hyper-V" exit 1 fi From 7a93d5f889c164b1485a02d1cbb570fa63ff6196 Mon Sep 17 00:00:00 2001 From: Chris Carmichael Date: Fri, 8 May 2020 07:14:13 -0600 Subject: [PATCH 5/6] make curl silent --- .github/workflows/local-dev-check.yml | 2 +- local_dev/docker-compose.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/local-dev-check.yml b/.github/workflows/local-dev-check.yml index 453e5c4..7a3fed3 100644 --- a/.github/workflows/local-dev-check.yml +++ b/.github/workflows/local-dev-check.yml @@ -15,6 +15,6 @@ jobs: - name: check-content run: | # download yq - curl https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o yq + curl https://github.com/mikefarah/yq/releases/download/3.3.0/yq_linux_amd64 -o yq --silent chmod +x ./yq ./scripts/invalid-docker-ports.sh diff --git a/local_dev/docker-compose.yml b/local_dev/docker-compose.yml index 46abc76..d5a7b03 100644 --- a/local_dev/docker-compose.yml +++ b/local_dev/docker-compose.yml @@ -1,6 +1,5 @@ # Important: We should avoid exposing any ports between `20000` and `36384` # see here for reasons why: https://github.com/logrhythm/boreas/tree/master/documentation/troubleshooting -# boo version: '3.7' volumes: From 9b9ee7d5d78dccf2986e011ee0e014a5836ada58 Mon Sep 17 00:00:00 2001 From: Chris Carmichael Date: Fri, 8 May 2020 07:16:18 -0600 Subject: [PATCH 6/6] try again --- local_dev/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/local_dev/docker-compose.yml b/local_dev/docker-compose.yml index d5a7b03..6c4a4e8 100644 --- a/local_dev/docker-compose.yml +++ b/local_dev/docker-compose.yml @@ -1,5 +1,6 @@ # Important: We should avoid exposing any ports between `20000` and `36384` # see here for reasons why: https://github.com/logrhythm/boreas/tree/master/documentation/troubleshooting +## trigger boo version: '3.7' volumes: