From 8b1f5dab49f36de9905e1fe45f4976a3d86398ce Mon Sep 17 00:00:00 2001
From: pataar <pietering1@gmail.com>
Date: Sat, 26 Feb 2022 17:02:25 +0100
Subject: [PATCH] refactor: restructure repository

---
 docker/Dockerfile => Dockerfile        | 17 ++++-------------
 README.md                              |  2 +-
 {docker => config}/simulavr.config     |  0
 {docker => config}/supervisord.conf    |  0
 docker-compose.yml                     |  2 +-
 {docker => scripts}/service_control.sh |  0
 {docker => scripts}/start.sh           |  0
 7 files changed, 6 insertions(+), 15 deletions(-)
 rename docker/Dockerfile => Dockerfile (90%)
 rename {docker => config}/simulavr.config (100%)
 rename {docker => config}/supervisord.conf (100%)
 rename {docker => scripts}/service_control.sh (100%)
 rename {docker => scripts}/start.sh (100%)

diff --git a/docker/Dockerfile b/Dockerfile
similarity index 90%
rename from docker/Dockerfile
rename to Dockerfile
index 06c1999..12bc909 100644
--- a/docker/Dockerfile
+++ b/Dockerfile
@@ -13,18 +13,10 @@ RUN apt-get update && apt-get install -y \
     build-essential \
     cmake \
     gcc-avr \
-    ### moonraker
-    curl \
-    iproute2 \
     libcurl4-openssl-dev \
-    libjpeg-dev \
-    liblmdb-dev \
-    libopenjp2-7 \
-    libsodium-dev \
     libssl-dev \
     python3-dev \
     python3-libgpiod \
-    zlib1g-dev \
     ### clean up
     && apt-get -y autoremove \
     && apt-get clean \
@@ -39,7 +31,7 @@ RUN git clone https://github.com/klipper3d/klipper && \
     /build/klippy-env/bin/pip install -r /build/klipper/scripts/klippy-requirements.txt
 
 #### Simulavr
-COPY docker/simulavr.config /usr/src
+COPY config/simulavr.config /usr/src
 RUN git clone -b master git://git.savannah.nongnu.org/simulavr.git && \
     # Build the firmware
     cd klipper && \
@@ -88,9 +80,9 @@ RUN groupadd --force -g 1000 printer \
     && echo 'printer ALL=(ALL:ALL) NOPASSWD:ALL' >> /etc/sudoers.d/printer
 
 ### copy all required files
-COPY docker/supervisord.conf /etc/supervisor/supervisord.conf
-COPY docker/start.sh /bin/start
-COPY docker/service_control.sh /bin/service_control
+COPY config/supervisord.conf /etc/supervisor/supervisord.conf
+COPY scripts/start.sh /bin/start
+COPY scripts/service_control.sh /bin/service_control
 
 ### make entrypoint executable
 RUN chmod +x /bin/start
@@ -99,7 +91,6 @@ RUN chmod +x /bin/service_control
 USER printer
 WORKDIR /home/printer
 
-
 # Copy our prebuilt applications from the builder stage
 COPY --from=builder --chown=printer:printer /build/klippy-env ./klippy-env
 COPY --from=builder --chown=printer:printer /build/klipper/ ./klipper/
diff --git a/README.md b/README.md
index 0422ade..c041e47 100644
--- a/README.md
+++ b/README.md
@@ -29,4 +29,4 @@ Klipper, Moonraker and a simulated Atmel ATmega micro-controller now run inside
 
 The container is build in a way, that you are able to quickly "re-install" Klipper and Moonraker or can quickly re-build the python environments or the firmware if that is ever necessary. For that, simply delete the corresponding folder/file and restart the container and the required components will be "installed" again.
 
-Feel free to contribute if you find solutions to make the docker image even smaller (~ 679 MB as of now) or provide ideas to generally improve this project.
+Feel free to contribute if you find solutions to make the docker image even smaller (~679 MB as of now) or provide ideas to generally improve this project.
diff --git a/docker/simulavr.config b/config/simulavr.config
similarity index 100%
rename from docker/simulavr.config
rename to config/simulavr.config
diff --git a/docker/supervisord.conf b/config/supervisord.conf
similarity index 100%
rename from docker/supervisord.conf
rename to config/supervisord.conf
diff --git a/docker-compose.yml b/docker-compose.yml
index 2eadcc3..569ded3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
     container_name: printer
     build:
       context: .
-      dockerfile: docker/Dockerfile
+      dockerfile: Dockerfile
     volumes:
       - ./printer_storage/.moonraker_database:/home/printer/.moonraker_database:delegated
       - ./printer_storage/gcode_files:/home/printer/gcode_files:delegated
diff --git a/docker/service_control.sh b/scripts/service_control.sh
similarity index 100%
rename from docker/service_control.sh
rename to scripts/service_control.sh
diff --git a/docker/start.sh b/scripts/start.sh
similarity index 100%
rename from docker/start.sh
rename to scripts/start.sh