Mercurial > riddim / changeset

--- a/Dockerfile	Thu Jun 11 15:28:18 2020 +0100
+++ b/Dockerfile	Thu Jun 11 15:30:08 2020 +0100
@@ -1,4 +1,6 @@
-FROM debian:9 AS squish
+#######
+
+FROM debian:buster-slim AS squish
 
 MAINTAINER Matthew Wild <mwild1@gmail.com>
 
@@ -11,6 +13,11 @@
         make \
         mercurial \
         ca-certificates \
+        bsdmainutils \
+        libidn11-dev \
+        liblua5.2-dev \
+        libssl-dev \
+        build-essential \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /tmp/build
@@ -23,28 +30,40 @@
 
 RUN hg clone https://code.matthewwild.co.uk/verse
 
+RUN cd prosody && ./configure && make
+
+RUN sed -i '/util\.encodings/d' verse/squishy
+
 RUN squish --prosody=./prosody verse
 
 ADD . riddim
 
 RUN squish riddim
 
-FROM alpine:3.8
+#########
 
-MAINTAINER Prosody Developers <docker@prosody.im>
+FROM debian:buster-slim
+
+MAINTAINER Matthew Wild <mwild1@gmail.com>
 
-# Install dependencies
-RUN apk add --update --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ \
-    lua5.2 \
-    lua5.2-expat \
-    lua5.2-socket \
-    lua5.2-sec \
-  && rm -rf /var/cache/apk/*
+RUN apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+        lua5.2 \
+	lua-filesystem \
+	lua-socket \
+	lua-sec \
+	lua-expat \
+	ca-certificates \
+	libidn11 \
+    && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /opt/riddim
 
+RUN mkdir -p /usr/local/lib/lua/5.2/util
+
 COPY --from=squish /tmp/build/verse.lua /opt/riddim/verse.lua
 COPY --from=squish /tmp/build/riddim.lua /opt/riddim/riddim.lua
+COPY --from=squish /tmp/build/prosody/util/encodings.so /usr/local/lib/lua/5.2/util/encodings.so
 
 ADD config.docker.lua /etc/riddim/config.lua
 
@@ -55,5 +74,3 @@
 VOLUME /etc/riddim
 
 CMD ["/etc/riddim/config.lua"]
-
-