From 6e33e063da3c83fd9bcffc89b72595933dc61d79 Mon Sep 17 00:00:00 2001 From: Javier Sigler Date: Tue, 4 Apr 2017 18:30:24 +0200 Subject: [PATCH 1/2] Remove layers and fix npm install of vendor --- Dockerfile | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index ddf6d9d676..32939f9599 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,19 +1,22 @@ FROM node:latest -RUN apt-get update && apt-get -y install dos2unix - +ENV NODE_ENV production +ENV MM_PORT 8080 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"] +RUN apt-get update \ + && apt-get -qy install tofrodos dos2unix \ + && chmod -R 777 vendor \ + && npm install \ + && cd vendor \ + && npm install \ + && cd .. \ + && dos2unix docker-entrypoint.sh \ + && chmod +x docker-entrypoint.sh EXPOSE $MM_PORT ENTRYPOINT ["/opt/magic_mirror/docker-entrypoint.sh"] From fa64ecf5130a6121c476626b7101555c1293fc1d Mon Sep 17 00:00:00 2001 From: Javier Sigler Date: Tue, 4 Apr 2017 18:34:19 +0200 Subject: [PATCH 2/2] Remove layers and fix npm install of vendor --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d883b16d7..144c5af62b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [2.1.2] - Unreleased ### Changed +- Fix the dockerfile to have it running from the first time. ### Added - Add in option to wrap long calendar events to multiple lines using `wrapEvents` configuration option.