From 3d476db982cf6c10fdee890ccd9303e3775c69ac Mon Sep 17 00:00:00 2001 From: Florin Lungu Date: Sat, 30 Nov 2024 18:11:20 +0100 Subject: [PATCH] switch from dart-sass-embedded to dart-sass --- src/docker/_base/_main.df | 2 +- src/docker/_base/{sass-embedded.df => sass.df} | 4 ++-- src/docker/debian-ext/Dockerfile | 2 +- src/docker/ubuntu-ext/Dockerfile | 2 +- src/files/_script/{sass-embedded.sh => sass.sh} | 13 ++++++++----- 5 files changed, 13 insertions(+), 10 deletions(-) rename src/docker/_base/{sass-embedded.df => sass.df} (59%) rename src/files/_script/{sass-embedded.sh => sass.sh} (56%) diff --git a/src/docker/_base/_main.df b/src/docker/_base/_main.df index b061579e..b6e92192 100644 --- a/src/docker/_base/_main.df +++ b/src/docker/_base/_main.df @@ -10,7 +10,7 @@ IMPORT nodejs AS nodejs IMPORT pandoc AS pandoc -IMPORT sass-embedded AS sass-embedded +IMPORT sass AS sass IMPORT files AS files diff --git a/src/docker/_base/sass-embedded.df b/src/docker/_base/sass.df similarity index 59% rename from src/docker/_base/sass-embedded.df rename to src/docker/_base/sass.df index b5e4dcc7..c650f56c 100644 --- a/src/docker/_base/sass-embedded.df +++ b/src/docker/_base/sass.df @@ -2,8 +2,8 @@ FROM base--image--alpine AS fetcher ARG TARGETPLATFORM -ADD _script/sass-embedded.sh sass-embedded.sh -RUN sh sass-embedded.sh +ADD _script/sass.sh sass.sh +RUN sh sass.sh diff --git a/src/docker/debian-ext/Dockerfile b/src/docker/debian-ext/Dockerfile index 969821ea..a483b1d2 100644 --- a/src/docker/debian-ext/Dockerfile +++ b/src/docker/debian-ext/Dockerfile @@ -2,7 +2,7 @@ FROM scratch as image COPY --from=base--hugo--extended / / COPY --from=base--pandoc / / -COPY --from=base--sass-embedded / / +COPY --from=base--sass / / #COPY --from=base--nodejs--glibc / / diff --git a/src/docker/ubuntu-ext/Dockerfile b/src/docker/ubuntu-ext/Dockerfile index 423ad6d5..c006a571 100644 --- a/src/docker/ubuntu-ext/Dockerfile +++ b/src/docker/ubuntu-ext/Dockerfile @@ -2,7 +2,7 @@ FROM scratch as image COPY --from=base--hugo--extended / / COPY --from=base--pandoc / / -COPY --from=base--sass-embedded / / +COPY --from=base--sass / / #COPY --from=base--nodejs--glibc / / diff --git a/src/files/_script/sass-embedded.sh b/src/files/_script/sass.sh similarity index 56% rename from src/files/_script/sass-embedded.sh rename to src/files/_script/sass.sh index 857798eb..513d0d93 100644 --- a/src/files/_script/sass-embedded.sh +++ b/src/files/_script/sass.sh @@ -6,7 +6,7 @@ set -e set -u # Variables -SASS_EMBEDDED_VERSION="1.62.1" +SASS_VERSION="1.81.0" # Architecture TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64} @@ -21,12 +21,15 @@ else fi # Download -wget https://github.com/sass/dart-sass-embedded/releases/download/${SASS_EMBEDDED_VERSION}/sass_embedded-${SASS_EMBEDDED_VERSION}-linux-${ARCH}.tar.gz \ - -O /sass-embedded.tar.gz +wget https://github.com/sass/dart-sass/releases/download/${SASS_VERSION}/dart-sass-${SASS_VERSION}-linux-${ARCH}.tar.gz \ + -O /sass.tar.gz # Unpack mkdir -p /files/usr/local/lib /files/usr/local/bin -tar -zxvf sass-embedded.tar.gz -C /files/usr/local/lib +tar -zxvf sass.tar.gz -C /files/usr/local/lib # Create symlink -ln -s /usr/local/lib/sass_embedded/dart-sass-embedded /files/usr/local/bin/dart-sass-embedded +ln -s /usr/local/lib/dart-sass/sass /files/usr/local/bin/sass + +# Create alias for saas --embedded +alias dart-sass-embedded="sass --embedded" \ No newline at end of file