Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable backup restore #135

Merged
merged 2 commits into from
Dec 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,15 @@ RUN curl -fsSLO --compressed --retry 3 --retry-delay 10 \

WORKDIR /opt/octoprint
RUN pip install .
RUN mkdir -p /octoprint/octoprint /octoprint/plugins

# Install mjpg-streamer
RUN curl -fsSLO --compressed --retry 3 --retry-delay 10 \
https://github.com/jacksonliam/mjpg-streamer/archive/master.tar.gz \
&& mkdir /mjpg \
&& tar xzf master.tar.gz -C /mjpg


WORKDIR /mjpg/mjpg-streamer-master/mjpg-streamer-experimental
RUN make
RUN make install
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,11 @@ then run the following commands:
docker-compose up -d config-editor
```

Now go to `http://<octoprint_ip_or_url>:8443/?folder=/config` in your browser to edit your octoprint files!
Now go to `http://<octoprint_ip_or_url>:8443/?folder=/octoprint` in your browser to edit your octoprint files!
Use the 'explorer' (accessible by clicking the hamburger menu icon) to explore folder and files to load
into the editor workspace.

All configuration files are in the `/config` folder, and the active configuration will be accessible at `/config/config.yaml`
All configuration files are in the `octoprint` folder, and the active configuration will be accessible at `/octoprint/octoprint/config.yaml`

When you're done, we recommend you stop and remove this service/container:

Expand Down
2 changes: 1 addition & 1 deletion compose.test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ services:
- GUID=0
- TZ=America/Chicago
volumes:
- octoprint:/config
- octoprint:/octoprint

volumes:
octoprint:
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ services:
# - GUID=0
# - TZ=America/Chicago
# volumes:
# - octoprint:/config
# - octoprint:/octoprint

volumes:
octoprint:
2 changes: 1 addition & 1 deletion root/etc/services.d/octoprint/run
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/usr/bin/with-contenv sh

exec octoprint serve --iknowwhatimdoing --host 0.0.0.0 --basedir /octoprint
exec octoprint serve --iknowwhatimdoing --host 0.0.0.0 --basedir /octoprint/octoprint
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,3 @@ webcam:
ffmpeg: /usr/bin/ffmpeg
snapshot: http://localhost:8080/?action=snapshot
stream: /webcam/?action=stream
plugins:
_disabled:
- backup