aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authors-ol <s-ol@users.noreply.github.com>2019-03-29 09:12:09 +0000
committers-ol <s-ol@users.noreply.github.com>2019-03-29 09:12:09 +0000
commitb1018633f0c96b0cb647b737bc43ef72420629a5 (patch)
tree2c126bff1a4326c168c67d837ae9c96d081a45fa
parentkeep last content and display nice errors when problems occur (diff)
downloadmmm-b1018633f0c96b0cb647b737bc43ef72420629a5.tar.gz
mmm-b1018633f0c96b0cb647b737bc43ef72420629a5.zip
fix sassc mismatch
-rw-r--r--Dockerfile2
-rw-r--r--Tupfile2
-rw-r--r--tup.config1
-rw-r--r--tup.docker.config2
4 files changed, 5 insertions, 2 deletions
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