Updates

Author: tsondt

Makefile

@@ -0,0 +1,18 @@
+.ONESHELL:
+.SHELLFLAGS = -e -u
+
+.PHONY: build
+build: # Build the Docker image
+	sh docker-build.sh
+
+.PHONY: run
+run: # Build and run the Docker image
+	sh docker-build.sh
+	sh docker-run.sh
+
+.PHONY: clean
+clean: # Clean up .bundle and Jekyll _site
+	rm -f Gemfile.lock
+	rm -rf .bundle
+	rm -rf _site
+	rm -rf .sass-cache

_config.yml

@@ -12,6 +12,7 @@ sass:
 
 exclude:
   - "*.sh"
+  - "Makefile"
   - "Dockerfile"
   - "Gemfile*"
   - "LICENSE"

docker-build.sh

@@ -1,4 +1,6 @@
-#!/usr/bin/env bash
+#!/usr/bin/env bash -eu
+
+CONTAINER_NAME="tsondt/wiki"
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-docker build -t "tsondt/wiki" "$DIR"
+docker build -t "${CONTAINER_NAME}" "$DIR"

docker-run.sh

@@ -1,5 +1,25 @@
-#!/usr/bin/env bash
+#!/usr/bin/env bash -eu
 
-docker run --rm -v $PWD:/srv -p 4000:4000 "tsondt/wiki" check ||
-docker run --rm -v $PWD:/srv -p 4000:4000 "tsondt/wiki" install &&
-docker run -ti --rm -v $PWD:/srv -p 4000:4000 "tsondt/wiki" exec jekyll serve --host 0.0.0.0 --port 4000 $1
+CONTAINER_NAME="tsondt/wiki"
+CONTAINER_PORT=4000
+ARGS="${CONTAINER_PORT}"
+
+usage () {
+    echo "Usage:"
+    echo -e "\t./docker-run.sh"
+    echo -e "\t./docker-run.sh [port] [extra args for jekyll serve]"
+}
+
+if ! [ $# -eq 0 ]; then
+    re='^[0-9]+$'
+    if ! [[ $1 =~ $re ]] ; then
+        usage
+        exit 1
+    fi
+    CONTAINER_PORT=$1
+    ARGS="$@"
+fi
+
+docker run --rm -v $PWD:/srv "${CONTAINER_NAME}" check ||
+docker run --rm -v $PWD:/srv "${CONTAINER_NAME}" install &&
+docker run -ti --rm -v $PWD:/srv -p ${CONTAINER_PORT}:${CONTAINER_PORT} "${CONTAINER_NAME}" exec jekyll serve --incremental --host 0.0.0.0 --port ${ARGS}

pages/03-application-security.md

@@ -17,6 +17,8 @@ title: Application Security
 - [Cheat Sheets](https://www.owasp.org/index.php/OWASP_Cheat_Sheet_Series){:target="_blank" rel="noopener"}
 - [Top 10 Privacy Risks Project](https://www.owasp.org/index.php/OWASP_Top_10_Privacy_Risks_Project){:target="_blank" rel="noopener"}
 - [Proactive Controls](https://www.owasp.org/index.php/OWASP_Proactive_Controls){:target="_blank" rel="noopener"}
+- [TimeGap Theory](https://owasp.org/www-project-timegap-theory/){:target="_blank" rel="noopener"}
+- [Juice Shop](https://owasp.org/www-project-juice-shop/){:target="_blank" rel="noopener"}
 
 ## Web
 ---

pages/13-startup-resources.md

@@ -25,3 +25,10 @@ title: Startup Resources
   - <https://itsallwidgets.com/>{:target="_blank" rel="noopener"}
   - <https://github.com/flutter/samples>{:target="_blank" rel="noopener"}
   - <https://github.com/brianegan/flutter_architecture_samples>{:target="_blank" rel="noopener"}
+
+## Design Tools
+---
+  - <https://www.sketch.com/>{:target="_blank" rel="noopener"}
+  - <https://www.figma.com/>{:target="_blank" rel="noopener"}
+  - <https://moqups.com/>{:target="_blank" rel="noopener"}
+  - <https://www.canva.com/>{:target="_blank" rel="noopener"}