Merge pull request #135 from OctoPrint/enable-backup-restore

Enable backup restore

Dockerfile

@@ -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

README.md

@@ -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:
 

compose.test.yml

@@ -24,7 +24,7 @@ services:
       - GUID=0
       - TZ=America/Chicago
     volumes:
-      - octoprint:/config
+      - octoprint:/octoprint
 
 volumes:
   octoprint:

docker-compose.yml

@@ -33,7 +33,7 @@ services:
   #    - GUID=0
   #    - TZ=America/Chicago
   #  volumes:
-  #    - octoprint:/config
+  #    - octoprint:/octoprint
 
 volumes:
   octoprint:

root/etc/services.d/octoprint/run

@@ -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

root/octoprint/config.yaml → root/octoprint/octoprint/config.yaml

@@ -5,6 +5,3 @@ webcam:
   ffmpeg: /usr/bin/ffmpeg
   snapshot: http://localhost:8080/?action=snapshot
   stream: /webcam/?action=stream
-plugins:
-  _disabled:
-  - backup