From 881009e6a56bd21c6311bf809b4b4952a9f50d3d Mon Sep 17 00:00:00 2001 From: Matthew Baggett Date: Thu, 27 Jun 2024 23:17:13 +0200 Subject: [PATCH] Uncommitted changes --- docker.tf | 6 +++++- printers.tf | 14 ++++++++++++++ printers/Dockerfile | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 printers.tf create mode 100644 printers/Dockerfile diff --git a/docker.tf b/docker.tf index 7745b14..e18c4ca 100644 --- a/docker.tf +++ b/docker.tf @@ -17,6 +17,10 @@ provider "ssh" { # } #} provider "docker" { - #host = "tcp://${data.ssh_tunnel.docker.local.address}" host = "ssh://california.ti" } + +provider "docker" { + alias = "printi" + host = "ssh://prin.ti" +} diff --git a/printers.tf b/printers.tf new file mode 100644 index 0000000..b6453f2 --- /dev/null +++ b/printers.tf @@ -0,0 +1,14 @@ +resource "docker_image" "octoprint" { + provider = "docker.printi" + name = "octoprint" + build { + context = "${path.module}/printers" + target = "octoprint-mjpg-streamer" + } +} +/* +resource "docker_container" "corexy" { + provider = "docker.printi" + image = docker_image.octoprint.name + name = "corexy" +}*/ \ No newline at end of file diff --git a/printers/Dockerfile b/printers/Dockerfile new file mode 100644 index 0000000..81f96ef --- /dev/null +++ b/printers/Dockerfile @@ -0,0 +1,35 @@ +FROM octoprint/octoprint AS octoprint +RUN apt update -q && \ + apt install -yq \ + cpulimit \ + sudo \ + curl wget \ + unzip \ + nano \ + && \ + apt-get autoremove -y && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/lib/dpkg/status.old /var/cache/debconf/templates.dat /var/log/dpkg.log /var/log/lastlog /var/log/apt/*.log + +FROM octoprint AS mjpg-streamer-builder +WORKDIR /build +RUN apt update -q && \ + apt install -yq unzip subversion +RUN curl -s -L https://github.com/pranjalv123/mjpg-streamer-yu12/archive/refs/heads/master.zip --output mjpeg-streamer-yu12.zip && \ + unzip -q mjpeg-streamer-yu12.zip +RUN cd mjpg-streamer-yu12-master/mjpg-streamer && \ + make && \ + ls -lah + +FROM octoprint AS octoprint-mjpg-streamer +COPY --from=mjpg-streamer-builder /build/mjpg-streamer-yu12-master/mjpg-streamer/mjpg_streamer /usr/local/bin/mjpg_streamer +COPY --from=mjpg-streamer-builder /build/mjpg-streamer-yu12-master/mjpg-streamer/*.so /usr/local/lib/mjpg-streamer/ + +FROM octoprint AS octoklipper +RUN git clone https://github.com/Klipper3d/klipper.git klipper && \ + cd klipper && \ + git checkout master && \ + rm .git -rf +RUN venv/bin/pip install -r klipper/scripts/klippy-requirements.txt \ + && venv/bin/python -m compileall klipper/klippy \ + && venv/bin/python klipper/klippy/chelper/__init__.py