From b1018633f0c96b0cb647b737bc43ef72420629a5 Mon Sep 17 00:00:00 2001 From: s-ol Date: Fri, 29 Mar 2019 10:12:09 +0100 Subject: fix sassc mismatch --- Dockerfile | 2 +- Tupfile | 2 +- tup.config | 1 + tup.docker.config | 2 ++ 4 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 tup.docker.config diff --git a/Dockerfile b/Dockerfile index 652a9a7..af0f4b5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ RUN apt-get install -y --allow-unauthenticated build-essential tup sassc libmark RUN luarocks install moonscript RUN luarocks install discount DISCOUNT_INCDIR=/usr/include/x86_64-linux-gnu COPY . /build -RUN cd /build && tup init && tup generate build.sh && ./build.sh +RUN cd /build && tup init && tup generate --config tup.docker.config build.sh && ./build.sh FROM nginx:alpine COPY --from=build-env /build/root /usr/share/nginx/html diff --git a/Tupfile b/Tupfile index ae63873..f3e300b 100644 --- a/Tupfile +++ b/Tupfile @@ -1,7 +1,7 @@ include_rules !download = |> ^ DOWNLOAD %O^ curl -L https://github.com/fengari-lua/fengari-web/releases/download/@(FENGARI_VERSION)/`basename %o` > %o |> -!sassc = |> ^ SCSS %b^ sassc -m auto %f %o |> | %o.map +!sassc = |> ^ SCSS %b^ sassc @(SASS_ARGS) %f %o |> | %o.map # download fengari dependencies : |> !download |> root/fengari-web.js diff --git a/tup.config b/tup.config index f39ec4d..7010858 100644 --- a/tup.config +++ b/tup.config @@ -1 +1,2 @@ CONFIG_FENGARI_VERSION=v0.1.4 +CONFIG_SASS_ARGS=-m auto diff --git a/tup.docker.config b/tup.docker.config new file mode 100644 index 0000000..7299d26 --- /dev/null +++ b/tup.docker.config @@ -0,0 +1,2 @@ +CONFIG_FENGARI_VERSION=v0.1.4 +CONFIG_SASS_ARGS=-m -- cgit v1.2.3