Update docker

friction2d · Nov 12, 2023 · a016252 · a016252
1 parent cc07f82
commit a016252
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 15 deletions.
diff --git a/src/scripts/build_docker.sh b/src/scripts/build_docker.sh
@@ -59,10 +59,6 @@ FRICTION_DIR="${FRICTION_ROOT}/friction"
 FRICTION_SRC_DIR="${FRICTION_DIR}/src"
 FRICTION_OUT_DIR="/snapshots"
 
-# if [ "${REL}" = 1 ]; then
-#     FRICTION_OUT_DIR="/releases"
-# fi
-
 FRICTION_DIST="${FRICTION_OUT_DIR}/distfiles"
 FRICTION_BRANCH=${FRICTION_BRANCH:-""}
 FRICTION_COMMIT=${FRICTION_COMMIT:-""}
@@ -80,7 +76,7 @@ elif [ "${FRICTION_TAG}" != "" ]; then
 fi
 
 GPERF_V="4df0b85"
-SKIA_V="72dd4c3cb3"
+SKIA_V="5ae542b872"
 
 SF_NET_SRC="https://sourceforge.net/projects/friction/files/source"
 

diff --git a/src/scripts/run_docker.sh b/src/scripts/run_docker.sh
@@ -40,11 +40,7 @@ elif [ "${REL}" = 1 ]; then
     SNAP=0
 fi
 
-MOUNT_DIR="releases"
-if [ "${SNAP}" = 1 ]; then
-    MOUNT_DIR="snapshots"
-fi
-
+MOUNT_DIR="snapshots"
 SF_NET_SRC="https://sourceforge.net/projects/friction/files/source"
 
 DOCKER_MOUNT="-t --mount type=bind,source=${CWD}/${MOUNT_DIR},target=/${MOUNT_DIR}"
@@ -60,13 +56,10 @@ if [ "${TAG}" != "" ]; then
 fi
 DOCKER="${DOCKER} ${DOCKER_MOUNT}"
 
-FRICTION_DIST="${CWD}/releases/distfiles"
-if [ "${SNAP}" = 1 ]; then
-    FRICTION_DIST="${CWD}/snapshots/distfiles"
-fi
+FRICTION_DIST="${CWD}/snapshots/distfiles"
 
 GPERF_V="4df0b85"
-SKIA_V="72dd4c3cb3"
+SKIA_V="5ae542b872"
 
 if [ ! -d "${FRICTION_DIST}" ]; then
     mkdir -p ${FRICTION_DIST}