Merge pull request #78 from weblyzard/master

msokk · web-flow · commit 0ba7666ae8ce · 2019-02-28T17:49:51.000+02:00
Set Electron version via --build-args
diff --git a/Dockerfile b/Dockerfile
@@ -2,36 +2,52 @@ FROM buildpack-deps:jessie-curl
 
 LABEL maintainer="Mihkel Sokk <mihkelsokk@gmail.com>"
 
-ENV RENDERER_ACCESS_KEY=changeme CONCURRENCY=1 WINDOW_WIDTH=1024 WINDOW_HEIGHT=768 NODE_ENV=production \
-    ELECTRON_VERSION=4.0.6 ELECTRON_ENABLE_STACK_DUMPING=true ELECTRON_ENABLE_LOGGING=true ELECTRON_DISABLE_SECURITY_WARNINGS=true
+ENV RENDERER_ACCESS_KEY=changeme \
+    CONCURRENCY=1 \
+    WINDOW_WIDTH=1024 \
+    WINDOW_HEIGHT=768 \
+    NODE_ENV=production \
+    ELECTRON_ENABLE_STACK_DUMPING=true \
+    ELECTRON_ENABLE_LOGGING=true \
+    ELECTRON_DISABLE_SECURITY_WARNINGS=true
 
 WORKDIR /app
 
 # Add subpixel hinting
 COPY .fonts.conf /root/.fonts.conf
 
 # Install the packages needed to run Electron
-RUN sed -i 's/main/main contrib/g' /etc/apt/sources.list && \
-    curl -sL https://deb.nodesource.com/setup_10.x | bash - && \
-    apt-get upgrade -y && \
-    apt-get install -y unzip xvfb libgtk2.0-0 ttf-mscorefonts-installer libnotify4 libgconf2-4 libxss1 libnss3 dbus-x11 && \
-    \
-    # Get Electron
-    wget "https://github.com/electron/electron/releases/download/v${ELECTRON_VERSION}/electron-v${ELECTRON_VERSION}-linux-x64.zip" -O electron.zip && \
-    unzip electron.zip && rm electron.zip && \
-    \
-    # Cleanup
-    apt-get remove -y unzip && apt-get clean && rm -rf /var/lib/apt/lists/*
-
-# as the inline fonts should not change much put them before the app
+RUN sed -i 's/main/main contrib/g' /etc/apt/sources.list
+RUN apt-get -y update
+RUN apt-get -y upgrade
+RUN apt-get install -y unzip xvfb libgtk2.0-0 ttf-mscorefonts-installer libnotify4 libgconf2-4 libxss1 libnss3 dbus-x11
+
+# As the inline fonts should not change much put them before the app
 COPY fonts/* /usr/share/fonts/truetype/
 
-COPY package.json /app/package.json
+# Install NodeJS
+RUN curl -sSL http://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -
+RUN echo "deb http://deb.nodesource.com/node_10.x jessie main" > /etc/apt/sources.list.d/nodesource.list
+RUN apt-get -y update
+RUN apt-get -y install nodejs
 
-RUN apt-get update && apt-get install -y nodejs && \
-    sed -i '/\"electron\"\:/d' ./package.json && \
-    npm install --production --no-optional && \
-    apt-get remove -y nodejs && apt-get clean && rm -rf /var/lib/apt/lists/*
+# Install dependencies
+COPY package.json /app/package.json
+RUN sed -i '/\"electron\"\:/d' ./package.json
+RUN npm install --production --no-optional
+
+# Install Electron
+# You can define a different Electron version on build using the `--build-args electron_version=x.y.z` argument
+ARG electron_version=4.0.6
+RUN wget "https://github.com/atom/electron/releases/download/v${electron_version}/electron-v${electron_version}-linux-x64.zip" -O electron.zip
+RUN unzip electron.zip
+RUN rm electron.zip
+
+# Clean up
+RUN apt-get remove -y unzip nodejs
+RUN apt-get clean
+RUN rm -rf /var/lib/apt/lists/*
+RUN rm -f /etc/apt/sources.list.d/nodesource.list
 
 COPY . /app
 
