-
-
Notifications
You must be signed in to change notification settings - Fork 4.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #811 from MichMich/develop
Release 2.1.1
- Loading branch information
Showing
176 changed files
with
3,469 additions
and
28,179 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,72 @@ | ||
# Various Node ignoramuses. | ||
|
||
logs | ||
*.log | ||
npm-debug.log* | ||
pids | ||
*.pid | ||
*.seed | ||
lib-cov | ||
coverage | ||
.grunt | ||
.lock-wscript | ||
build/Release | ||
node_modules | ||
jspm_modules | ||
.npm | ||
.node_repl_history | ||
|
||
# Various Windows ignoramuses. | ||
Thumbs.db | ||
ehthumbs.db | ||
Desktop.ini | ||
$RECYCLE.BIN/ | ||
*.cab | ||
*.msi | ||
*.msm | ||
*.msp | ||
*.lnk | ||
|
||
# Various OSX ignoramuses. | ||
.DS_Store | ||
.AppleDouble | ||
.LSOverride | ||
Icon | ||
._* | ||
.DocumentRevisions-V100 | ||
.fseventsd | ||
.Spotlight-V100 | ||
.TemporaryItems | ||
.Trashes | ||
.VolumeIcon.icns | ||
.AppleDB | ||
.AppleDesktop | ||
Network Trash Folder | ||
Temporary Items | ||
.apdisk | ||
|
||
# Various Linux ignoramuses. | ||
|
||
.fuse_hidden* | ||
.directory | ||
.Trash-* | ||
|
||
# Various Magic Mirror ignoramuses and anti-ignoramuses. | ||
|
||
# Don't ignore the node_helper core module. | ||
!/modules/node_helper | ||
!/modules/node_helper/** | ||
|
||
# Ignore all modules except the default modules. | ||
/modules/** | ||
!/modules/default/** | ||
|
||
# Ignore changes to the custom css files. | ||
/css/custom.css | ||
|
||
# Ignore unnecessary files for docker | ||
CHANGELOG.md | ||
LICENSE.md | ||
README.md | ||
Gruntfile.js | ||
.* |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
vendor/ | ||
vendor/* | ||
!/vendor/vendor.js | ||
!/modules/default/** | ||
!/modules/node_helper | ||
!/modules/node_helper/** | ||
!/modules/default/defaultmodules.js | ||
!/modules/default/defaultmodules.js |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,16 @@ | ||
language: node_js | ||
node_js: | ||
- "7" | ||
- "6" | ||
- "5.1" | ||
before_script: | ||
- npm install grunt-cli -g | ||
script: grunt | ||
- "export DISPLAY=:99.0" | ||
- "sh -e /etc/init.d/xvfb start" | ||
- sleep 5 | ||
script: | ||
- grunt | ||
- npm test | ||
cache: | ||
directories: | ||
- node_modules |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
FROM node:latest | ||
|
||
RUN apt-get update && apt-get -y install dos2unix | ||
|
||
WORKDIR /opt/magic_mirror | ||
COPY . . | ||
COPY /modules unmount_modules | ||
COPY /config unmount_config | ||
|
||
ENV NODE_ENV production | ||
ENV MM_PORT 8080 | ||
|
||
RUN npm install | ||
|
||
RUN ["dos2unix", "docker-entrypoint.sh"] | ||
RUN ["chmod", "+x", "docker-entrypoint.sh"] | ||
|
||
EXPOSE $MM_PORT | ||
ENTRYPOINT ["/opt/magic_mirror/docker-entrypoint.sh"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.