Merge branch 'master' into suzieq-lesson-image

nre-learning · Mar 29, 2021 · bbcf5a7 · bbcf5a7
2 parents bc09b03 + 62cbc69
commit bbcf5a7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/.scripts/check-changelog.sh b/.scripts/check-changelog.sh
@@ -14,7 +14,7 @@ echo "ENV TO FOLLOW"
 echo $(env)
 
 
-if [ "$GITHUB_EVENT_NAME" != "pull_request" ];
+if [ "$GITHUB_EVENT_NAME" != "pull_request_target" ];
 then
   echo "This is not a pull request, skipping the changelog check"
   exit 0

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Git lesson stage 5 [#324](https://github.com/nre-learning/nrelabs-curriculum/pull/324)
 - Adding image build to preview pipeline [#352](https://github.com/nre-learning/nrelabs-curriculum/pull/352)
 - More image build changes (moving to GH actions) [#354](https://github.com/nre-learning/nrelabs-curriculum/pull/354)
+- SuzieQ Image and Lesson [#357](https://github.com/nre-learning/nrelabs-curriculum/pull/357)
 
 ## v1.3.0 - December 13, 2020
 

diff --git a/images/suzieq/Dockerfile b/images/suzieq/Dockerfile
@@ -5,6 +5,8 @@ FROM netenglabs/suzieq:0.9
 RUN apt-get update && apt-get install -y openssh-server python3 python3-pip dnsutils iputils-ping git vim curl util-linux sshpass nano jq libxml2-utils
 RUN mkdir /var/run/sshd
 
+RUN foobarfoobarfoobar
+
 # Antidote user
 RUN mkdir -p /home/antidote
 RUN useradd antidote -p antidotepassword