kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 11:50:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #825 from javiersigler/task/improve_dockerfile

Browse Source 
Task/improve dockerfile
This commit is contained in:
Michael Teeuw 2017-04-05 20:14:46 +02:00 committed by GitHub
commit 400d577546
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
## [2.1.2] - Unreleased ## [2.1.2] - Unreleased
### Changed ### Changed
- Fix the dockerfile to have it running from the first time.
### Added ### Added
- Add in option to wrap long calendar events to multiple lines using `wrapEvents` configuration option. - Add in option to wrap long calendar events to multiple lines using `wrapEvents` configuration option.

21
Dockerfile
View File

@ -1,19 +1,22 @@
FROM node:latest FROM node:latest
RUN apt-get update && apt-get -y install dos2unix ENV NODE_ENV production
ENV MM_PORT 8080
WORKDIR /opt/magic_mirror WORKDIR /opt/magic_mirror
COPY . . COPY . .
COPY /modules unmount_modules COPY /modules unmount_modules
COPY /config unmount_config COPY /config unmount_config
ENV NODE_ENV production RUN apt-get update \
ENV MM_PORT 8080 && apt-get -qy install tofrodos dos2unix \
&& chmod -R 777 vendor \
RUN npm install && npm install \
&& cd vendor \
RUN ["dos2unix", "docker-entrypoint.sh"] && npm install \
RUN ["chmod", "+x", "docker-entrypoint.sh"] && cd .. \
&& dos2unix docker-entrypoint.sh \
&& chmod +x docker-entrypoint.sh
EXPOSE $MM_PORT EXPOSE $MM_PORT
ENTRYPOINT ["/opt/magic_mirror/docker-entrypoint.sh"] ENTRYPOINT ["/opt/magic_mirror/docker-entrypoint.sh"]