From dcf14ccfa1648cc375912b6da33a220033f3d63a Mon Sep 17 00:00:00 2001
From: s-ol <s+removethis@s-ol.nu>
Date: Sat, 6 Mar 2021 16:13:48 +0100
Subject: drop Tup dependency

---
 Dockerfile | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'Dockerfile')

diff --git a/Dockerfile b/Dockerfile
index 3c718c5..996b358 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,8 @@
 FROM nickblah/lua:5.3-luarocks-stretch
 
-RUN echo "deb http://ppa.launchpad.net/jonathonf/tup/ubuntu xenial main" \
-      >/etc/apt/sources.list.d/tup.list
 RUN apt-get update && \
-    apt-get install -y --allow-unauthenticated \
-      build-essential m4 tup sassc \
-      libmarkdown2-dev libsqlite3-dev libssl-dev
+    apt-get install -y \
+      build-essential m4 sassc libmarkdown2-dev libsqlite3-dev libssl-dev
 RUN luarocks install discount DISCOUNT_INCDIR=/usr/include/x86_64-linux-gnu
 RUN luarocks install sqlite3 && \
     luarocks install moonscript && \
@@ -15,7 +12,9 @@ RUN luarocks install sqlite3 && \
 
 COPY . /code
 WORKDIR /code
-RUN tup init && tup generate build-static.sh && ./build-static.sh
+RUN mkdir -p root/static/mmm && \
+  find mmm -name '*.moon' | \
+  moon build/bundle_modules.moon 'root/static/mmm/text$lua.lua'
 
 EXPOSE 8000
 ENTRYPOINT ["moon", "build/server.moon"]
-- 
cgit v1.2.3