Merge pull request #856 from bastilimbach/develop

Outsource Dockerfiles
MagicMirrorOrg · Apr 19, 2017 · efb592d · efb592d
2 parents fa5b936 + 058b4bb
commit efb592d
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 111 deletions.
diff --git a/.dockerignore b/.dockerignore
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [2.1.2] - Unreleased
 
 ### Changed
+- Revert Docker related changes in favor of [docker-MagicMirror](https://github.com/bastilimbach/docker-MagicMirror). All Docker images are outsourced. ([#856](https://github.com/MichMich/MagicMirror/pull/856))
 - Change Docker base image (Debian + Node) to an arm based distro (AlpineARM + Node) ([#846](https://github.com/MichMich/MagicMirror/pull/846))
 - Fix the dockerfile to have it running from the first time.
 

diff --git a/Dockerfile b/Dockerfile
diff --git a/README.md b/README.md
@@ -59,7 +59,7 @@ docker run  -d \
 			--volume ~/magic_mirror/config:/opt/magic_mirror/config \
 			--volume ~/magic_mirror/modules:/opt/magic_mirror/modules \
 			--name magic_mirror \
-			michmich/magicmirror
+			bastilimbach/docker-magicmirror
 ```
 
 | **Volumes** | **Description** |
@@ -75,6 +75,8 @@ var config = {
 };
 ```
 
+If you want to run the server on a raspberry pi, use the `raspberry` tag. (bastilimbach/docker-magicmirror:raspberry)
+
 #### Manual
 
 1. Download and install the latest Node.js version.

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh