From 44dafda25065da2b493ab479fc1220625a9288be Mon Sep 17 00:00:00 2001
From: Rasmus Andersson <rasmus@notion.se>
Date: Tue, 22 Oct 2019 17:35:33 -0700
Subject: Update docker image

---
 misc/docker/Dockerfile |  1 +
 misc/docker/build.sh   | 21 ++++++++++++---------
 2 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'misc/docker')

diff --git a/misc/docker/Dockerfile b/misc/docker/Dockerfile
index 34ffed119..2b607bcc9 100644
--- a/misc/docker/Dockerfile
+++ b/misc/docker/Dockerfile
@@ -12,6 +12,7 @@ COPY . /inter/
 RUN rm Dockerfile
 
 RUN ln -s /host/src src \
+ && ln -s /host/misc misc \
  && ln -s /host/version.txt . \
  && ln -s /host/githash.txt . \
  && ln -s /host/Makefile . \
diff --git a/misc/docker/build.sh b/misc/docker/build.sh
index 159e9677b..fe91a715a 100755
--- a/misc/docker/build.sh
+++ b/misc/docker/build.sh
@@ -12,7 +12,7 @@ IMAGE_NAME=rsms/inter-build
 BUILD_DIR=$ROOT_DIR/build/docker
 
 # setup build dir
-mkdir -p "$BUILD_DIR/misc/tools"
+mkdir -p "$BUILD_DIR/misc/tools" "$BUILD_DIR/misc/fontbuildlib"
 
 # copy files to build dir
 echo "Syncing build dir"
@@ -20,14 +20,17 @@ cp -a \
   init.sh \
   requirements.txt \
   "$DOCKER_DIR/Dockerfile" \
-  "$BUILD_DIR/" &
-rsync -v -acC --delete --filter="- *.pyc" --filter="- /*/" \
-  "misc/tools/" \
-  "$BUILD_DIR/misc/tools/" &
-rsync -v -acC --delete \
-  misc/fontbuild \
-  misc/ttf2woff \
-  "$BUILD_DIR/misc/"
+  "$BUILD_DIR/"
+# rsync -v -acC --delete --filter="- *.pyc" --filter="- /*/" \
+#   "misc/tools/" \
+#   "$BUILD_DIR/misc/tools/" &
+# rsync -v -acC --delete --filter="- *.pyc" --filter="- /*/" \
+#   "misc/fontbuildlib/" \
+#   "$BUILD_DIR/misc/fontbuildlib/" &
+# rsync -v -acC --delete \
+#   misc/fontbuild \
+#   misc/ttf2woff \
+#   "$BUILD_DIR/misc/"
 wait
 
 # update githash.txt
-- 
cgit v1.2.3