diff options
| author | s-ol <s-ol@users.noreply.github.com> | 2019-03-29 09:12:09 +0000 |
|---|---|---|
| committer | s-ol <s-ol@users.noreply.github.com> | 2019-03-29 09:12:09 +0000 |
| commit | b1018633f0c96b0cb647b737bc43ef72420629a5 (patch) | |
| tree | 2c126bff1a4326c168c67d837ae9c96d081a45fa | |
| parent | keep last content and display nice errors when problems occur (diff) | |
| download | mmm-b1018633f0c96b0cb647b737bc43ef72420629a5.tar.gz mmm-b1018633f0c96b0cb647b737bc43ef72420629a5.zip | |
fix sassc mismatch
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | Tupfile | 2 | ||||
| -rw-r--r-- | tup.config | 1 | ||||
| -rw-r--r-- | tup.docker.config | 2 |
4 files changed, 5 insertions, 2 deletions
@@ -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 @@ -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 @@ -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 |
