mirror of
https://github.com/mkuf/prind.git
synced 2025-10-30 18:05:55 +01:00
Add yamllint action (#110)
This commit is contained in:
2
.github/workflows/image-build-klipper.yaml
vendored
2
.github/workflows/image-build-klipper.yaml
vendored
@@ -10,4 +10,4 @@ jobs:
|
|||||||
app: klipper
|
app: klipper
|
||||||
secrets:
|
secrets:
|
||||||
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
|
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
|
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
|||||||
@@ -10,4 +10,4 @@ jobs:
|
|||||||
app: klipperscreen
|
app: klipperscreen
|
||||||
secrets:
|
secrets:
|
||||||
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
|
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
|
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
|||||||
2
.github/workflows/image-build-moonraker.yaml
vendored
2
.github/workflows/image-build-moonraker.yaml
vendored
@@ -10,4 +10,4 @@ jobs:
|
|||||||
app: moonraker
|
app: moonraker
|
||||||
secrets:
|
secrets:
|
||||||
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
|
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
|
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
|||||||
2
.github/workflows/image-build-ustreamer.yaml
vendored
2
.github/workflows/image-build-ustreamer.yaml
vendored
@@ -10,4 +10,4 @@ jobs:
|
|||||||
app: ustreamer
|
app: ustreamer
|
||||||
secrets:
|
secrets:
|
||||||
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
|
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
|
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
|||||||
2
.github/workflows/image-docs-klipper.yaml
vendored
2
.github/workflows/image-docs-klipper.yaml
vendored
@@ -15,4 +15,4 @@ jobs:
|
|||||||
short-description: "Klipper is a 3d-Printer firmware."
|
short-description: "Klipper is a 3d-Printer firmware."
|
||||||
secrets:
|
secrets:
|
||||||
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
|
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
|
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
|||||||
@@ -15,4 +15,4 @@ jobs:
|
|||||||
short-description: "KlipperScreen is a touchscreen GUI that interfaces with Klipper via Moonraker."
|
short-description: "KlipperScreen is a touchscreen GUI that interfaces with Klipper via Moonraker."
|
||||||
secrets:
|
secrets:
|
||||||
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
|
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
|
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
|||||||
2
.github/workflows/image-docs-moonraker.yaml
vendored
2
.github/workflows/image-docs-moonraker.yaml
vendored
@@ -15,4 +15,4 @@ jobs:
|
|||||||
short-description: "Web API used to interact with the 3D printing firmware Klipper."
|
short-description: "Web API used to interact with the 3D printing firmware Klipper."
|
||||||
secrets:
|
secrets:
|
||||||
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
|
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
|
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
|||||||
2
.github/workflows/image-docs-ustreamer.yaml
vendored
2
.github/workflows/image-docs-ustreamer.yaml
vendored
@@ -15,4 +15,4 @@ jobs:
|
|||||||
short-description: "µStreamer is a lightweight and very quick server to stream MJPEG video"
|
short-description: "µStreamer is a lightweight and very quick server to stream MJPEG video"
|
||||||
secrets:
|
secrets:
|
||||||
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
|
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
|
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
|
|||||||
11
.github/workflows/pr-yamllint.yaml
vendored
Normal file
11
.github/workflows/pr-yamllint.yaml
vendored
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
name: YAML Lint
|
||||||
|
|
||||||
|
on: pull_request
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
yamllint:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- name: Run yamllint
|
||||||
|
uses: reviewdog/action-yamllint@v1
|
||||||
@@ -20,13 +20,13 @@ jobs:
|
|||||||
image-docs:
|
image-docs:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- name: "Update Docker Hub Description"
|
- name: "Update Docker Hub Description"
|
||||||
uses: peter-evans/dockerhub-description@v3
|
uses: peter-evans/dockerhub-description@v3
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||||
repository: ${{ secrets.DOCKERHUB_USERNAME }}/${{ inputs.app }}
|
repository: ${{ secrets.DOCKERHUB_USERNAME }}/${{ inputs.app }}
|
||||||
short-description: ${{ inputs.short-description }}
|
short-description: ${{ inputs.short-description }}
|
||||||
readme-filepath: ./docker/${{ inputs.app }}/README.md
|
readme-filepath: ./docker/${{ inputs.app }}/README.md
|
||||||
enable-url-completion: true
|
enable-url-completion: true
|
||||||
|
|||||||
9
.yamllint.yaml
Normal file
9
.yamllint.yaml
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
extends: default
|
||||||
|
|
||||||
|
rules:
|
||||||
|
document-start:
|
||||||
|
present: false
|
||||||
|
line-length:
|
||||||
|
max: 180
|
||||||
|
truthy:
|
||||||
|
check-keys: false
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
serial:
|
serial:
|
||||||
additionalPorts:
|
additionalPorts:
|
||||||
- /opt/printer_data/run/klipper.tty
|
- /opt/printer_data/run/klipper.tty
|
||||||
autoconnect: true
|
autoconnect: true
|
||||||
port: /opt/printer_data/run/klipper.tty
|
port: /opt/printer_data/run/klipper.tty
|
||||||
webcam:
|
webcam:
|
||||||
snapshot: http://webcam:8080/snapshot
|
snapshot: http://webcam:8080/snapshot
|
||||||
stream: /webcam/stream
|
stream: /webcam/stream
|
||||||
accessControl:
|
accessControl:
|
||||||
userfile: /octoprint/octoprint/users.yaml
|
userfile: /octoprint/octoprint/users.yaml
|
||||||
|
|||||||
@@ -12,14 +12,22 @@
|
|||||||
## * https://github.com/nicolargo/glances is used to generate and display metrics
|
## * https://github.com/nicolargo/glances is used to generate and display metrics
|
||||||
##
|
##
|
||||||
## Setup
|
## Setup
|
||||||
## 1. Add your personal config to this file and copy it to the root of the repository, overwriting the existing docker-compose.override.yaml
|
## 1. Add your personal config to this file and copy it to the root of the repository,
|
||||||
|
## overwriting the existing docker-compose.override.yaml
|
||||||
## 2. start the stack as described in the main readme using profiles of your choice
|
## 2. start the stack as described in the main readme using profiles of your choice
|
||||||
|
|
||||||
## Ustreamer base Service
|
## Ustreamer base Service
|
||||||
x-ustreamer-svc: &ustreamer-svc
|
x-ustreamer-svc: &ustreamer-svc
|
||||||
image: mkuf/ustreamer:latest
|
image: mkuf/ustreamer:latest
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
command: --host=0.0.0.0 --port=8080 --slowdown --device=/dev/webcam --resolution=1280x960 --format=MJPEG --desired-fps=30
|
command: >
|
||||||
|
--host=0.0.0.0
|
||||||
|
--port=8080
|
||||||
|
--slowdown
|
||||||
|
--device=/dev/webcam
|
||||||
|
--resolution=1280x960
|
||||||
|
--format=MJPEG
|
||||||
|
--desired-fps=30
|
||||||
|
|
||||||
## Add your personal config here
|
## Add your personal config here
|
||||||
services:
|
services:
|
||||||
@@ -54,4 +62,4 @@ services:
|
|||||||
traefik.http.routers.webcam.rule: PathPrefix(`/webcam`)
|
traefik.http.routers.webcam.rule: PathPrefix(`/webcam`)
|
||||||
traefik.http.routers.webcam.entrypoints: web
|
traefik.http.routers.webcam.entrypoints: web
|
||||||
traefik.http.middlewares.webcam.stripprefix.prefixes: /webcam
|
traefik.http.middlewares.webcam.stripprefix.prefixes: /webcam
|
||||||
traefik.http.routers.webcam.middlewares: webcam
|
traefik.http.routers.webcam.middlewares: webcam
|
||||||
|
|||||||
@@ -14,20 +14,29 @@
|
|||||||
## * timelapses will be saved to `/opt/timelapse` on the host machine
|
## * timelapses will be saved to `/opt/timelapse` on the host machine
|
||||||
##
|
##
|
||||||
## Setup
|
## Setup
|
||||||
## 1. Add the gcode macros provided by moonraker-timelapse to your printers configuration file https://github.com/mainsail-crew/moonraker-timelapse/blob/main/klipper_macro/timelapse.cfg
|
## 1. Add the gcode macros provided by moonraker-timelapse to your printers configuration file
|
||||||
|
## https://github.com/mainsail-crew/moonraker-timelapse/blob/main/klipper_macro/timelapse.cfg
|
||||||
## 2. Add the following to your moonraker.conf
|
## 2. Add the following to your moonraker.conf
|
||||||
## ```
|
## ```
|
||||||
## [timelapse]
|
## [timelapse]
|
||||||
## output_path: /opt/timelapse/
|
## output_path: /opt/timelapse/
|
||||||
## ```
|
## ```
|
||||||
## 3. Add your personal config to this file and copy it to the root of the repository, overwriting the existing docker-compose.override.yaml
|
## 3. Add your personal config to this file and copy it to the root of the repository,
|
||||||
|
## overwriting the existing docker-compose.override.yaml
|
||||||
## 4. start the stack as described in the main readme using mainsail or fluidd as profile
|
## 4. start the stack as described in the main readme using mainsail or fluidd as profile
|
||||||
|
|
||||||
## Ustreamer base Service
|
## Ustreamer base Service
|
||||||
x-ustreamer-svc: &ustreamer-svc
|
x-ustreamer-svc: &ustreamer-svc
|
||||||
image: mkuf/ustreamer:latest
|
image: mkuf/ustreamer:latest
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
command: --host=0.0.0.0 --port=8080 --slowdown --device=/dev/webcam --resolution=1280x960 --format=MJPEG --desired-fps=30
|
command: >
|
||||||
|
--host=0.0.0.0
|
||||||
|
--port=8080
|
||||||
|
--slowdown
|
||||||
|
--device=/dev/webcam
|
||||||
|
--resolution=1280x960
|
||||||
|
--format=MJPEG
|
||||||
|
--desired-fps=30
|
||||||
|
|
||||||
## Add your personal config here
|
## Add your personal config here
|
||||||
services:
|
services:
|
||||||
@@ -68,4 +77,4 @@ services:
|
|||||||
traefik.http.routers.webcam.rule: PathPrefix(`/webcam`)
|
traefik.http.routers.webcam.rule: PathPrefix(`/webcam`)
|
||||||
traefik.http.routers.webcam.entrypoints: web
|
traefik.http.routers.webcam.entrypoints: web
|
||||||
traefik.http.middlewares.webcam.stripprefix.prefixes: /webcam
|
traefik.http.middlewares.webcam.stripprefix.prefixes: /webcam
|
||||||
traefik.http.routers.webcam.middlewares: webcam
|
traefik.http.routers.webcam.middlewares: webcam
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
## Usecase: Run multiple Printers on the same Host
|
## Usecase: Run multiple Printers on the same Host
|
||||||
##
|
##
|
||||||
## Assumptions:
|
## Assumptions:
|
||||||
## * I have two printers
|
## * I have two printers
|
||||||
## * One is called printer1, the other one printer2
|
## * One is called printer1, the other one printer2
|
||||||
## * printer1 is using serial port /dev/ttyUSB0 and webcam /dev/video0
|
## * printer1 is using serial port /dev/ttyUSB0 and webcam /dev/video0
|
||||||
@@ -55,7 +55,14 @@ x-moonraker-svc: &moonraker-svc
|
|||||||
x-ustreamer-svc: &ustreamer-svc
|
x-ustreamer-svc: &ustreamer-svc
|
||||||
image: mkuf/ustreamer:latest
|
image: mkuf/ustreamer:latest
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
command: --host=0.0.0.0 --port=8080 --slowdown --device=/dev/webcam --resolution=1280x960 --format=MJPEG --desired-fps=30
|
command: >
|
||||||
|
--host=0.0.0.0
|
||||||
|
--port=8080
|
||||||
|
--slowdown
|
||||||
|
--device=/dev/webcam
|
||||||
|
--resolution=1280x960
|
||||||
|
--format=MJPEG
|
||||||
|
--desired-fps=30
|
||||||
|
|
||||||
## Service Definitions
|
## Service Definitions
|
||||||
services:
|
services:
|
||||||
@@ -64,13 +71,20 @@ services:
|
|||||||
## Access api via port 8101/tcp and webcam via 8102/tcp
|
## Access api via port 8101/tcp and webcam via 8102/tcp
|
||||||
printer1-klipper:
|
printer1-klipper:
|
||||||
<<: *klipper-svc
|
<<: *klipper-svc
|
||||||
command: -I printer_data/run/printer1.klipper.tty -a printer_data/run/printer1.klipper.sock printer_data/config/printer1.cfg -l printer_data/logs/printer1.klippy.log
|
command: >
|
||||||
|
-I printer_data/run/printer1.klipper.tty
|
||||||
|
-a printer_data/run/printer1.klipper.sock
|
||||||
|
printer_data/config/printer1.cfg
|
||||||
|
-l printer_data/logs/printer1.klippy.log
|
||||||
labels:
|
labels:
|
||||||
org.prind.service: klipper
|
org.prind.service: klipper
|
||||||
org.prind.printer: printer1
|
org.prind.printer: printer1
|
||||||
printer1-moonraker:
|
printer1-moonraker:
|
||||||
<<: *moonraker-svc
|
<<: *moonraker-svc
|
||||||
command: -d printer_data -c printer_data/config/printer1.moonraker.conf -l printer_data/logs/printer1.moonraker.log
|
command: >
|
||||||
|
-d printer_data
|
||||||
|
-c printer_data/config/printer1.moonraker.conf
|
||||||
|
-l printer_data/logs/printer1.moonraker.log
|
||||||
ports:
|
ports:
|
||||||
- 8101:7125
|
- 8101:7125
|
||||||
labels:
|
labels:
|
||||||
@@ -90,13 +104,20 @@ services:
|
|||||||
## Access api via port 8201/tcp and webcam via 8202/tcp
|
## Access api via port 8201/tcp and webcam via 8202/tcp
|
||||||
printer2-klipper:
|
printer2-klipper:
|
||||||
<<: *klipper-svc
|
<<: *klipper-svc
|
||||||
command: -I printer_data/run/printer2.klipper.tty -a printer_data/run/printer2.klipper.sock printer_data/config/printer2.cfg -l printer_data/logs/printer2.klippy.log
|
command: >
|
||||||
|
-I printer_data/run/printer2.klipper.tty
|
||||||
|
-a printer_data/run/printer2.klipper.sock
|
||||||
|
printer_data/config/printer2.cfg
|
||||||
|
-l printer_data/logs/printer2.klippy.log
|
||||||
labels:
|
labels:
|
||||||
org.prind.service: klipper
|
org.prind.service: klipper
|
||||||
org.prind.printer: printer2
|
org.prind.printer: printer2
|
||||||
printer2-moonraker:
|
printer2-moonraker:
|
||||||
<<: *moonraker-svc
|
<<: *moonraker-svc
|
||||||
command: -d printer_data -c printer_data/config/printer2.moonraker.conf -l printer_data/logs/printer2.moonraker.log
|
command: >
|
||||||
|
-d printer_data
|
||||||
|
-c printer_data/config/printer2.moonraker.conf
|
||||||
|
-l printer_data/logs/printer2.moonraker.log
|
||||||
ports:
|
ports:
|
||||||
- 8201:7125
|
- 8201:7125
|
||||||
labels:
|
labels:
|
||||||
@@ -124,4 +145,4 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
run:
|
run:
|
||||||
gcode:
|
gcode:
|
||||||
log:
|
log:
|
||||||
|
|||||||
@@ -29,7 +29,11 @@ services:
|
|||||||
depends_on:
|
depends_on:
|
||||||
init:
|
init:
|
||||||
condition: service_completed_successfully
|
condition: service_completed_successfully
|
||||||
command: -I printer_data/run/klipper.tty -a printer_data/run/klipper.sock printer_data/config/printer.cfg -l printer_data/logs/klippy.log
|
command: >
|
||||||
|
-I printer_data/run/klipper.tty
|
||||||
|
-a printer_data/run/klipper.sock
|
||||||
|
printer_data/config/printer.cfg
|
||||||
|
-l printer_data/logs/klippy.log
|
||||||
volumes:
|
volumes:
|
||||||
- /dev:/dev
|
- /dev:/dev
|
||||||
- ./config:/opt/printer_data/config
|
- ./config:/opt/printer_data/config
|
||||||
@@ -70,7 +74,14 @@ services:
|
|||||||
webcam:
|
webcam:
|
||||||
image: mkuf/ustreamer:latest
|
image: mkuf/ustreamer:latest
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
command: --host=0.0.0.0 --port=8080 --slowdown --device=/dev/webcam --resolution=1280x960 --format=MJPEG --desired-fps=30
|
command: >
|
||||||
|
--host=0.0.0.0
|
||||||
|
--port=8080
|
||||||
|
--slowdown
|
||||||
|
--device=/dev/webcam
|
||||||
|
--resolution=1280x960
|
||||||
|
--format=MJPEG
|
||||||
|
--desired-fps=30
|
||||||
devices:
|
devices:
|
||||||
- /dev/video0:/dev/webcam
|
- /dev/video0:/dev/webcam
|
||||||
labels:
|
labels:
|
||||||
@@ -111,7 +122,7 @@ services:
|
|||||||
- "80:80"
|
- "80:80"
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- "/var/run/docker.sock:/var/run/docker.sock:ro"
|
- "/var/run/docker.sock:/var/run/docker.sock:ro"
|
||||||
labels:
|
labels:
|
||||||
org.prind.service: traefik
|
org.prind.service: traefik
|
||||||
|
|
||||||
|
|||||||
@@ -12,17 +12,25 @@
|
|||||||
## * init container will set the permissions to the new UID/GID
|
## * init container will set the permissions to the new UID/GID
|
||||||
##
|
##
|
||||||
## Setup
|
## Setup
|
||||||
## 1. Add your personal config to this file and copy it to the root of the repository, overwriting the existing docker-compose.override.yaml
|
## 1. Add your personal config to this file and copy it to the root of the repository,
|
||||||
## 2. Replace the example UID and GID of '4242' in the 'dockerfile_inline' block of the klipper and moonraker services,
|
## overwriting the existing docker-compose.override.yaml
|
||||||
|
## 2. Replace the example UID and GID of '4242' in the 'dockerfile_inline' block of the klipper and moonraker services,
|
||||||
## as well as in the command of the init service with your specific requirements.
|
## as well as in the command of the init service with your specific requirements.
|
||||||
## Make sure to use the identical UIDs/GIDs in klipper and moonraker.
|
## Make sure to use the identical UIDs/GIDs in klipper and moonraker.
|
||||||
## 3. start the stack as described in the main readme using a profile of your choice.
|
## 3. start the stack as described in the main readme using a profile of your choice.
|
||||||
|
|
||||||
## Ustreamer base Service
|
## Ustreamer base Service
|
||||||
x-ustreamer-svc: &ustreamer-svc
|
x-ustreamer-svc: &ustreamer-svc
|
||||||
image: mkuf/ustreamer:latest
|
image: mkuf/ustreamer:latest
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
command: --host=0.0.0.0 --port=8080 --slowdown --device=/dev/webcam --resolution=1280x960 --format=MJPEG --desired-fps=30
|
command: >
|
||||||
|
--host=0.0.0.0
|
||||||
|
--port=8080
|
||||||
|
--slowdown
|
||||||
|
--device=/dev/webcam
|
||||||
|
--resolution=1280x960
|
||||||
|
--format=MJPEG
|
||||||
|
--desired-fps=30
|
||||||
|
|
||||||
## Add your personal config here
|
## Add your personal config here
|
||||||
services:
|
services:
|
||||||
@@ -60,4 +68,4 @@ services:
|
|||||||
traefik.http.routers.webcam.rule: PathPrefix(`/webcam`)
|
traefik.http.routers.webcam.rule: PathPrefix(`/webcam`)
|
||||||
traefik.http.routers.webcam.entrypoints: web
|
traefik.http.routers.webcam.entrypoints: web
|
||||||
traefik.http.middlewares.webcam.stripprefix.prefixes: /webcam
|
traefik.http.middlewares.webcam.stripprefix.prefixes: /webcam
|
||||||
traefik.http.routers.webcam.middlewares: webcam
|
traefik.http.routers.webcam.middlewares: webcam
|
||||||
|
|||||||
@@ -4,4 +4,4 @@ services:
|
|||||||
entrypoint: python3 /opt/klipper/scripts/calibrate_shaper.py
|
entrypoint: python3 /opt/klipper/scripts/calibrate_shaper.py
|
||||||
working_dir: /opt/resonances
|
working_dir: /opt/resonances
|
||||||
volumes:
|
volumes:
|
||||||
- ./resonances:/opt/resonances
|
- ./resonances:/opt/resonances
|
||||||
|
|||||||
@@ -8,4 +8,4 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- /dev:/dev
|
- /dev:/dev
|
||||||
- ./config/build.config:/opt/klipper/.config
|
- ./config/build.config:/opt/klipper/.config
|
||||||
- ./out:/opt/klipper/out
|
- ./out:/opt/klipper/out
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ services:
|
|||||||
build:
|
build:
|
||||||
context: docker/klipper
|
context: docker/klipper
|
||||||
target: build-simulavr
|
target: build-simulavr
|
||||||
args:
|
args:
|
||||||
VERSION: master
|
VERSION: master
|
||||||
privileged: true
|
privileged: true
|
||||||
volumes:
|
volumes:
|
||||||
@@ -14,7 +14,7 @@ services:
|
|||||||
- run:/opt/printer_data/run
|
- run:/opt/printer_data/run
|
||||||
labels:
|
labels:
|
||||||
org.prind.service: simulavr
|
org.prind.service: simulavr
|
||||||
|
|
||||||
## Reconfigure Klipper service for simulavr
|
## Reconfigure Klipper service for simulavr
|
||||||
klipper:
|
klipper:
|
||||||
depends_on:
|
depends_on:
|
||||||
@@ -22,4 +22,8 @@ services:
|
|||||||
condition: service_completed_successfully
|
condition: service_completed_successfully
|
||||||
simulavr:
|
simulavr:
|
||||||
condition: service_started
|
condition: service_started
|
||||||
command: -I printer_data/run/klipper.tty -a printer_data/run/klipper.sock printer_data/config/printer-simulavr.cfg -l printer_data/logs/klippy.log
|
command: >
|
||||||
|
-I printer_data/run/klipper.tty
|
||||||
|
-a printer_data/run/klipper.sock
|
||||||
|
printer_data/config/printer-simulavr.cfg
|
||||||
|
-l printer_data/logs/klippy.log
|
||||||
|
|||||||
@@ -2,7 +2,14 @@
|
|||||||
x-ustreamer-svc: &ustreamer-svc
|
x-ustreamer-svc: &ustreamer-svc
|
||||||
image: mkuf/ustreamer:latest
|
image: mkuf/ustreamer:latest
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
command: --host=0.0.0.0 --port=8080 --slowdown --device=/dev/webcam --resolution=1280x960 --format=MJPEG --desired-fps=30
|
command: >
|
||||||
|
--host=0.0.0.0
|
||||||
|
--port=8080
|
||||||
|
--slowdown
|
||||||
|
--device=/dev/webcam
|
||||||
|
--resolution=1280x960
|
||||||
|
--format=MJPEG
|
||||||
|
--desired-fps=30
|
||||||
|
|
||||||
## Add your personal config here
|
## Add your personal config here
|
||||||
services:
|
services:
|
||||||
@@ -17,4 +24,4 @@ services:
|
|||||||
traefik.http.routers.webcam.rule: PathPrefix(`/webcam`)
|
traefik.http.routers.webcam.rule: PathPrefix(`/webcam`)
|
||||||
traefik.http.routers.webcam.entrypoints: web
|
traefik.http.routers.webcam.entrypoints: web
|
||||||
traefik.http.middlewares.webcam.stripprefix.prefixes: /webcam
|
traefik.http.middlewares.webcam.stripprefix.prefixes: /webcam
|
||||||
traefik.http.routers.webcam.middlewares: webcam
|
traefik.http.routers.webcam.middlewares: webcam
|
||||||
|
|||||||
@@ -12,7 +12,11 @@ services:
|
|||||||
depends_on:
|
depends_on:
|
||||||
init:
|
init:
|
||||||
condition: service_completed_successfully
|
condition: service_completed_successfully
|
||||||
command: -I printer_data/run/klipper.tty -a printer_data/run/klipper.sock printer_data/config/printer.cfg -l printer_data/logs/klippy.log
|
command: >
|
||||||
|
-I printer_data/run/klipper.tty
|
||||||
|
-a printer_data/run/klipper.sock
|
||||||
|
printer_data/config/printer.cfg
|
||||||
|
-l printer_data/logs/klippy.log
|
||||||
volumes:
|
volumes:
|
||||||
- /dev:/dev
|
- /dev:/dev
|
||||||
- ./config:/opt/printer_data/config
|
- ./config:/opt/printer_data/config
|
||||||
@@ -196,7 +200,7 @@ services:
|
|||||||
- "80:80"
|
- "80:80"
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- "/var/run/docker.sock:/var/run/docker.sock:ro"
|
- "/var/run/docker.sock:/var/run/docker.sock:ro"
|
||||||
labels:
|
labels:
|
||||||
org.prind.service: traefik
|
org.prind.service: traefik
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user