.trunk/trunk.yaml

@@ -27,7 +27,7 @@ lint:
     - markdownlint@0.41.0
     - taplo@0.8.1
     - actionlint@1.7.1
-    - checkov@3.2.156
+    - checkov@3.2.148
     - git-diff-check
     - prettier@3.3.2
     - yamllint@1.35.1

docker.tf

@@ -17,15 +17,6 @@ provider "ssh" {
 #  }
 #}
 provider "docker" {
+  #host = "tcp://${data.ssh_tunnel.docker.local.address}"
   host = "ssh://california.ti"
 }
-
-provider "docker" {
-  alias = "printi"
-  host = "ssh://prin.ti"
-}
-
-provider "docker" {
-  alias = "unifi"
-  host = "ssh://unifi.ti"
-}

printers.tf

@@ -1,14 +0,0 @@
-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"
-}*/

printers/Dockerfile

@@ -1,35 +0,0 @@
-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