diff --git a/.gitignore b/.gitignore index dcaf71693e4a4e96739438640406f4f66c7a2dd4..bb2d2baa75ebbb23e47612df2c30207ef418055e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ index.html +site diff --git a/Dockerfile b/Dockerfile index 567d175d7f18a4c0dde2c4dca5af583d42d7717a..07fdfeca6be47ed4c4d40b64dcfee1b2ebfb0ed8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,2 +1,5 @@ FROM nginx +COPY site/index.html /usr/share/nginx/html/ +COPY site/css /usr/share/nginx/html/css +RUN ls /usr/share/nginx/html/ diff --git a/Makefile b/Makefile index 811a7512c9a70ccf69165c95f72950166a22c567..6128db4412828120d0f151e0d754531f0ea010b8 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,12 @@ -STYLES := ../css/tufte-css/tufte.css \ - ../css/pandoc.css \ - ../css/pandoc-solarized.css \ - ../css/tufte-extra.css +STYLES := css/tufte-css/tufte.css \ + css/pandoc.css \ + css/pandoc-solarized.css \ + css/tufte-extra.css all: index.html index.html: index.md Makefile - pandoc -o $@ $< -t html5 -c ../css/styling.css + pandoc -o $@ $< -t html5 -c css/styling.css --self-contained deploy: all mkdir -p site diff --git a/export.sh b/export.sh index dda6b56f3cdcc3bed9ee7fd82b8cda3ff22bcdb9..ecdb7f7ffbe214016775fb4b4933ba142ccbf00f 100755 --- a/export.sh +++ b/export.sh @@ -5,7 +5,7 @@ if [ -z ${SL_CLASS_ROOT+x} ]; then echo "SL_CLASS_ROOT is unset"; else echo "var if [ -z ${MTI_CLASS_ROOT+x} ]; then echo "MTI_CLASS_ROOT is unset"; else echo "var is set to '$MTI_CLASS_ROOT'"; fi ## declare classes directories -declare -a arr=("$RUST_CLASS_ROOT" "$SL_CLASS_ROOT" "$MTI_CLASS_ROOT") +declare -a arr=("$RUST_CLASS_ROOT" "$SL_CLASS_ROOT" "$MTI_CLASS_ROOT" "$(pwd)") ## now loop through the above array for i in "${arr[@]}" @@ -17,6 +17,8 @@ do make deploy -C $i done +echo "$(pwd)"/site/ + docker stop rustclass docker build -t rustclasscont . docker run --rm \