Update docker image

colelawrence · Oct 23, 2019 · 44dafda · 44dafda
1 parent 88f43cc
commit 44dafda
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git 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
@@ -12,22 +12,25 @@ 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"
 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