From f7563ea17664b64d6b963149ceaa3da93ab3037d Mon Sep 17 00:00:00 2001 From: Ilona Podliashanyk Date: Tue, 5 Mar 2024 12:48:15 +0100 Subject: [PATCH] Use updated scripts in docker --- tools/docker/build.sh | 2 +- tools/docker/sass-watch.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/docker/build.sh b/tools/docker/build.sh index 62ed337675..491fb0a5f7 100755 --- a/tools/docker/build.sh +++ b/tools/docker/build.sh @@ -10,7 +10,7 @@ fi cd /source sudo -u nav python3 -m build pip install -e . -sudo -u nav make webpacksass +sudo -u nav make sassbuild if [[ ! -f "/etc/nav/nav.conf" ]]; then echo "Copying initial NAV config files into this container" diff --git a/tools/docker/sass-watch.sh b/tools/docker/sass-watch.sh index 5bdeb9f099..4c60d5b11d 100755 --- a/tools/docker/sass-watch.sh +++ b/tools/docker/sass-watch.sh @@ -4,5 +4,5 @@ cd /source while inotifywait -e modify -e move -e create -e delete -r --exclude \# /source/python/nav/web/sass do - (cd python/nav/web/static/js && npm run build:sass:prod) + make sasswatch done