Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
pedrolamas committed Dec 13, 2024
2 parents a3bb43e + 8811f0d commit 52ab176
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ ARG KLIPPER_SHA
ARG MOONRAKER_SHA

RUN <<eot
set -e
apt-get update -qq
apt-get install -y --no-install-recommends --no-install-suggests \
avr-libc \
Expand All @@ -41,6 +42,7 @@ eot
WORKDIR /build

RUN <<eot
set -e
git clone git://git.savannah.nongnu.org/simulavr.git
(
cd simulavr
Expand All @@ -59,6 +61,7 @@ RUN git clone $KLIPPER_REPOSITORY klipper
COPY klipper ./klipper/

RUN <<eot
set -e
(
cd klipper
[ -n "$KLIPPER_SHA" ] && git reset --hard $KLIPPER_SHA || true
Expand All @@ -72,6 +75,7 @@ RUN <<eot
eot

RUN <<eot
set -e
git clone $MOONRAKER_REPOSITORY moonraker
(
cd moonraker
Expand All @@ -83,6 +87,7 @@ RUN <<eot
eot

RUN <<eot
set -e
git clone --depth 1 https://github.com/jacksonliam/mjpg-streamer
(
cd mjpg-streamer
Expand Down Expand Up @@ -112,6 +117,7 @@ WORKDIR /output
COPY klipper_config ./printer_data/config

RUN <<eot
set -e
(
cd printer_data
mkdir comms
Expand Down Expand Up @@ -154,6 +160,7 @@ WORKDIR /printer
COPY --from=build /output .

RUN <<eot
set -e
apt-get update -qq
apt-get install -y --no-install-recommends --no-install-suggests \
ca-certificates \
Expand Down

0 comments on commit 52ab176

Please sign in to comment.