From 78e27131ee794d5c7e8c5f805d7266bc6331e4a9 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Sat, 14 Apr 2018 18:25:33 +0200 Subject: [PATCH] Dockerfile fixed --- Dockerfile | 8 -------- Dockerfile.build | 27 ++------------------------- 2 files changed, 2 insertions(+), 33 deletions(-) diff --git a/Dockerfile b/Dockerfile index 653ce1a53..de1b25aee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,14 +3,6 @@ # FROM squidex/aspnetcore-build-phantomjs:2.0.3-jessie as builder -# Install Google Chrome -RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - - -RUN sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' - -RUN apt-get update - && apt-get install -y google-chrome-stable - COPY src/Squidex/package.json /tmp/package.json # Install Node packages diff --git a/Dockerfile.build b/Dockerfile.build index f09cbb2bb..64500c456 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -1,30 +1,7 @@ -FROM microsoft/aspnetcore-build:2.0.0 - -# Install runtime dependencies -RUN apt-get update \ - && apt-get install -y --no-install-recommends ca-certificates bzip2 libfontconfig \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - - # Install official PhantomJS release -RUN set -x \ - && apt-get update \ - && apt-get install -y --no-install-recommends \ - && mkdir /srv/var \ - && mkdir /tmp/phantomjs \ - # Download Phantom JS - && curl -L https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 | tar -xj --strip-components=1 -C /tmp/phantomjs \ - # Copy binaries only - && mv /tmp/phantomjs/bin/phantomjs /usr/local/bin \ - # Create symbol link - # Clean up - && apt-get autoremove -y \ - && apt-get clean all \ - && rm -rf /tmp/* /var/lib/apt/lists/* - -RUN phantomjs --version +FROM squidex/aspnetcore-build-phantomjs:2.0.3-jessie as builder COPY src/Squidex/package.json /tmp/package.json + RUN cd /tmp \ && npm install \ && npm rebuild node-sass