From 2cf12f5c035c18aa9594c0d3a780cf14fad930e6 Mon Sep 17 00:00:00 2001
From: Mayel de Borniol <git@mayel.space>
Date: Mon, 17 Apr 2023 10:06:21 +1200
Subject: [PATCH] Remove messctl

---
 Dockerfile.dev | 19 ----------------
 Dockerfile.old | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 19 deletions(-)
 create mode 100644 Dockerfile.old

diff --git a/Dockerfile.dev b/Dockerfile.dev
index 1f95ab9b60..3b0061e744 100755
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -1,23 +1,7 @@
 # stage to build the dependency manager
-FROM rust:1-alpine AS messctl_build
-# FROM elixir:1.12-alpine AS messctl_build
-
 ARG FLAVOUR
 ARG FLAVOUR_PATH
 
-# build deps
-# RUN apk update && apk add git rust cargo
-
-# fetch messctl
-RUN mkdir -p forks/messctl
-RUN (cd forks/messctl/origin && git pull) || git clone https://github.com/bonfire-networks/messctl forks/messctl/origin 
-RUN cd forks/messctl/origin && git checkout 8f53c86687ba2bd262471c6e8d9490ed00bf1306
-# FIXME: try using latest version of messctl?
-
-# compile messctl
-RUN cd forks/messctl && cp -r origin/* . && cargo build --release && cargo install --path . --verbose
-
-
 FROM elixir:1.14-alpine
 
 ENV HOME=/opt/app/ TERM=xterm USER=docker 
@@ -48,9 +32,6 @@ RUN apk add git rust cargo
 # dependencies for image processing 
 RUN apk add imagemagick vips-tools
 
-# install the dependency manager
-COPY --from=messctl_build forks/messctl/target/release/messctl /bin/
-
 # JS package manager & builders
 # RUN npm install -g pnpm esbuild postcss
 
diff --git a/Dockerfile.old b/Dockerfile.old
new file mode 100644
index 0000000000..2d8d8b66fe
--- /dev/null
+++ b/Dockerfile.old
@@ -0,0 +1,59 @@
+# stage to build the dependency manager
+FROM rust:1.52 AS messctl_build
+# FROM elixir:1.12-alpine AS messctl_build
+
+ARG FLAVOUR
+ARG FLAVOUR_PATH
+
+# build deps
+# RUN apk update && apk add git rust cargo
+
+# fetch messctl
+RUN git clone https://github.com/bonfire-networks/messctl forks/messctl/origin 2> /dev/null || (cd forks/messctl/origin && git pull)
+RUN cd forks/messctl/origin && git checkout 8f53c86687ba2bd262471c6e8d9490ed00bf1306
+# FIXME: try using latest version of messctl
+
+# compile messctl
+RUN cd forks/messctl && cp -r origin/* . && cargo build --release && cargo install --path . --verbose
+
+
+FROM elixir:1.14-alpine
+
+ENV HOME=/opt/app/ TERM=xterm USER=docker 
+WORKDIR $HOME
+
+# dev tools
+RUN apk update && \
+    apk add bash curl inotify-tools
+
+# various dependencies of dependencies
+RUN apk add file \
+    npm yarn \
+    git \
+    mailcap \
+    ca-certificates openssh-client openssl-dev \
+    tzdata \
+    gettext
+
+# deps to compile NIF deps (eg. tree_magic)
+RUN apk add git rust cargo  
+
+# dependencies for comeonin (not needed for dev)
+#RUN apk add cmake make gcc libc-dev
+
+# dependencies for encryption (experimental)
+# RUN apk add olm
+
+# dependencies for image processing 
+RUN apk add imagemagick vips-tools
+
+# install the dependency manager
+COPY --from=messctl_build forks/messctl/target/release/messctl /bin/
+
+# JS package manager & builders
+# RUN npm install -g pnpm esbuild postcss
+
+EXPOSE 4000/tcp
+EXPOSE 4004/tcp
+
+CMD ["sh","-c","iex --sname dev -S mix phx.server"]