From 932a967db7d89aded3883d3755e736aa80f356d5 Mon Sep 17 00:00:00 2001
From: Orestis Malaspinas <orestis.malaspinas@hesge.ch>
Date: Sun, 9 Sep 2018 12:42:38 +0200
Subject: [PATCH] ajout divers
---
.gitignore | 1 +
Dockerfile | 3 +++
Makefile | 10 +++++-----
export.sh | 4 +++-
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/.gitignore b/.gitignore
index dcaf716..bb2d2ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
index.html
+site
diff --git a/Dockerfile b/Dockerfile
index 567d175..07fdfec 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 811a751..6128db4 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 dda6b56..ecdb7f7 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 \
--
GitLab