Skip to content

Commit 9ad5ef4

Browse files
authored
Sw 1291 dev docker image (mrbeam#1509)
* SW-1291 add config for dev to docker image * SW-1291 config octoprint to point to our github and avoid running plugin as root
1 parent f033ac3 commit 9ad5ef4

File tree

2 files changed

+40
-2
lines changed

2 files changed

+40
-2
lines changed

Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,12 @@ RUN source ./venv2/bin/activate \
5454
RUN source ./venv2/bin/activate \
5555
&& pip install opencv-python==4.2.0.32
5656

57-
COPY . /home/mrbeam/MrBeamPlugin/
57+
COPY --chown=mrbeam ./docker-octoprint-config.yaml /home/mrbeam/.octoprint/config.yaml
58+
59+
COPY --chown=mrbeam . /home/mrbeam/MrBeamPlugin/
5860

5961
RUN source ./venv2/bin/activate \
60-
&& sudo -u mrbeam env "PATH=$PATH" pip install ./MrBeamPlugin
62+
&& pip install ./MrBeamPlugin
6163

6264
CMD [ "./venv2/bin/python", "-m", "octoprint", "serve", "--port", "5000" ]
6365

docker-octoprint-config.yaml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
accessControl:
2+
salt: uFXtaVdDFLrL0Kul6h5V54e4bAgluve0
3+
api:
4+
key: 08F036424792493A85A2A82C7E45DFC9
5+
plugins:
6+
announcements:
7+
_config_version: 1
8+
discovery:
9+
upnpUuid: d4126c5c-4659-4869-a894-dc300e38bdd7
10+
mrbeam:
11+
_config_version: 2
12+
analyticsEnabled: false
13+
dev:
14+
env: DEV
15+
software_tier: ALPHA
16+
review:
17+
ask: true
18+
softwareupdate:
19+
_config_version: 6
20+
check_providers:
21+
findmymrbeam: mrbeam
22+
mrbeam: mrbeam
23+
netconnectd: mrbeam
24+
checks:
25+
octoprint:
26+
pip: https://github.com/mrbeam/OctoPrint/archive/{target_version}.zip
27+
user: mrbeam
28+
serial:
29+
autoconnect: true
30+
baudrate: 115200
31+
port: /dev/ttyAMA0
32+
server:
33+
firstRun: false
34+
secretKey: qVJcMugtq9U9khQ9pXkKpTfuPUc5HC15
35+
seenWizards:
36+
mrbeam: 22

0 commit comments

Comments
 (0)