Skip to content

Commit

Permalink
Merge pull request #93 from droppyjs/fix/docker
Browse files Browse the repository at this point in the history
fix: adjust dockerfile to build properly, use new debian image, slim
  • Loading branch information
markhughes authored Jan 29, 2024
2 parents 3a07e7c + 3e171ce commit 4f96e75
Showing 1 changed file with 12 additions and 10 deletions.
22 changes: 12 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
#
# .:.
# ::: .:::::. Droppy
# ..:::.. ::: Made with love <3
# ':::' :::
# ..:::.. ::: Made with love <3
# ':::' :::
# '
#

# -------------------------------------------------- #
# BASE
# -------------------------------------------------- #

FROM debian:10.9 as base
FROM debian:12.4-slim as base

SHELL ["/bin/bash", "-c"]

Expand All @@ -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


# -------------------------------------------------- #
Expand All @@ -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


# -------------------------------------------------- #
Expand Down Expand Up @@ -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/ \
Expand Down

0 comments on commit 4f96e75

Please sign in to comment.