zach
/
virtual-klipper-printer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update stuff

This commit is contained in:
pataar 2022-02-24 22:29:08 +01:00
parent 760f098156
commit 1eea5140d9
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
docker/Dockerfile
View File

@ -5,7 +5,6 @@ RUN apt-get update && apt-get install -y \
--no-install-suggests \ --no-install-suggests \
### non specific packages ### non specific packages
git \ git \
sudo \
swig \ swig \
virtualenv \ virtualenv \
### klipper ### klipper
@ -15,7 +14,6 @@ RUN apt-get update && apt-get install -y \
cmake \ cmake \
gcc-avr \ gcc-avr \
### moonraker ### moonraker
supervisor \
curl \ curl \
iproute2 \ iproute2 \
libcurl4-openssl-dev \ libcurl4-openssl-dev \
@ -36,11 +34,9 @@ WORKDIR /build
### Prepare our applications ### Prepare our applications
#### Klipper #### Klipper
RUN git clone --depth=1 https://github.com/klipper3d/klipper && \ RUN git clone https://github.com/klipper3d/klipper && \
rm -rf klipper/docs klipper/test klipper/.github && \
virtualenv -p python3 /build/klippy-env && \ virtualenv -p python3 /build/klippy-env && \
/build/klippy-env/bin/pip install -r /build/klipper/scripts/klippy-requirements.txt && \ /build/klippy-env/bin/pip install -r /build/klipper/scripts/klippy-requirements.txt
rm -rf lib
#### Simulavr #### Simulavr
COPY docker/simulavr.config /usr/src COPY docker/simulavr.config /usr/src
@ -58,8 +54,7 @@ RUN git clone -b master git://git.savannah.nongnu.org/simulavr.git && \
make clean make clean
#### Moonraker #### Moonraker
RUN git clone --depth=1 https://github.com/Arksine/moonraker && \ RUN git clone https://github.com/Arksine/moonraker && \
rm -rf moonraker/docs moonraker/tests moonraker/.github && \
virtualenv -p python3 /build/moonraker-env && \ virtualenv -p python3 /build/moonraker-env && \
/build/moonraker-env/bin/pip install -r /build/moonraker/scripts/moonraker-requirements.txt /build/moonraker-env/bin/pip install -r /build/moonraker/scripts/moonraker-requirements.txt
@ -71,15 +66,13 @@ RUN apt-get update && apt-get install -y \
--no-install-suggests \ --no-install-suggests \
### non specific packages ### non specific packages
git \ git \
build-essential \
supervisor \ supervisor \
sudo \ sudo \
swig \
### moonraker ### moonraker
curl \ curl \
iproute2 \ iproute2 \
python3-libgpiod \
libcurl4-openssl-dev \ libcurl4-openssl-dev \
libjpeg-dev \
liblmdb-dev \ liblmdb-dev \
libopenjp2-7 \ libopenjp2-7 \
libsodium-dev \ libsodium-dev \
@ -96,18 +89,20 @@ RUN groupadd --force -g 1000 printer \
### copy all required files ### copy all required files
COPY docker/supervisord.conf /etc/supervisor/supervisord.conf COPY docker/supervisord.conf /etc/supervisor/supervisord.conf
COPY docker/service_control.sh /bin/service_control
COPY docker/start.sh /bin/start COPY docker/start.sh /bin/start
COPY docker/service_control.sh /bin/service_control
### make entrypoint executable ### make entrypoint executable
RUN chmod +x /bin/start RUN chmod +x /bin/start
RUN chmod +x /bin/service_control
USER printer USER printer
WORKDIR /home/printer WORKDIR /home/printer
# Copy our prebuilt applications from the builder stage # 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/klippy-env ./klippy-env
COPY --from=builder --chown=printer:printer /build/klipper ./klipper COPY --from=builder --chown=printer:printer /build/klipper/ ./klipper/
COPY --from=builder --chown=printer:printer /build/moonraker ./moonraker COPY --from=builder --chown=printer:printer /build/moonraker ./moonraker
COPY --from=builder --chown=printer:printer /build/moonraker-env ./moonraker-env COPY --from=builder --chown=printer:printer /build/moonraker-env ./moonraker-env
COPY --from=builder --chown=printer:printer /build/simulavr ./simulavr COPY --from=builder --chown=printer:printer /build/simulavr ./simulavr

2
docker/supervisord.conf
View File

@ -18,7 +18,7 @@ serverurl=unix:///tmp/supervisor.sock
file=/tmp/supervisor.sock file=/tmp/supervisor.sock
[program:simulavr] [program:simulavr]
command=bash -c 'sleep 10 && /home/printer/klipper/scripts/avrsim.py -m atmega644 /home/printer/simulavr.elf' command=bash -c 'sleep 10 && /home/printer/klipper/scripts/avrsim.py -m atmega644 -s 20000000 -b 250000 /home/printer/simulavr.elf'
environment=PYTHONPATH=/home/printer/simulavr/build/pysimulavr/ environment=PYTHONPATH=/home/printer/simulavr/build/pysimulavr/
user=printer user=printer
process_name=simulavr process_name=simulavr