From 3e171ce3e3e3bc10969d8d35a62aec647b17b018 Mon Sep 17 00:00:00 2001 From: Mark Hughes Date: Mon, 29 Jan 2024 21:06:35 +1100 Subject: [PATCH] fix: adjust dockerfile to build properly --- Dockerfile | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 420dfba9..15b56e4d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,8 +2,8 @@ # # .:. # ::: .:::::. Droppy -# ..:::.. ::: Made with love <3 -# ':::' ::: +# ..:::.. ::: Made with love <3 +# ':::' ::: # ' # @@ -11,7 +11,7 @@ # BASE # -------------------------------------------------- # -FROM debian:10.9 as base +FROM debian:12.4-slim as base SHELL ["/bin/bash", "-c"] @@ -23,7 +23,7 @@ ENV PATH $VOLTA_HOME/bin:$PATH RUN apt-get -y update && \ apt-get -y install aria2 gnupg software-properties-common \ python3 git curl bash openssl && \ - curl https://get.volta.sh | bash + curl https://get.volta.sh | bash # -------------------------------------------------- # @@ -32,11 +32,13 @@ RUN apt-get -y update && \ FROM base as builder -RUN apt-get -y install -y make gcc g++ && \ - git clone --depth=1 https://github.com/droppyjs/droppy /droppy && \ - rm -rf /droppy/node_modules && \ +RUN apt-get -y install -y make gcc g++ + +RUN git clone --depth=1 https://github.com/droppyjs/droppy /droppy + +RUN rm -rf /droppy/node_modules && \ cd /droppy && \ - yarn + yarn # -------------------------------------------------- # @@ -64,9 +66,9 @@ RUN cd /droppy && \ /tmp/* \ /usr/lib/node_modules \ /usr/local/lib/node_modules \ - /usr/local/share/.cache && \ + /usr/local/share/.cache && \ apt-get -y remove --purge --auto-remove systemd && \ - rm -rf /var/cache/apt/archives/ \ + rm -rf /var/cache/apt/archives/ \ /var/lib/apt/lists/ \ /usr/share/man/ \ /usr/share/locale/ \