From e62d5ce15c0b0350e6f910ffa49ca8154cbfb066 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Sat, 14 Apr 2018 20:18:26 +0200 Subject: [PATCH] Use fixed image --- Dockerfile | 2 +- Dockerfile.build | 2 +- libs/Dockerfile | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0a54ea7df..ed342ba9d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # # Stage 1, Prebuild # -FROM squidex/aspnetcore-build-phantomjs-chromium:2.0.3-jessie as builder +FROM squidex/aspnetcore-build-phantomjs-chromium:2.0.3-jessie-fix1 as builder COPY src/Squidex/package.json /tmp/package.json diff --git a/Dockerfile.build b/Dockerfile.build index 91e8d8317..4f7849adb 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -1,4 +1,4 @@ -FROM squidex/aspnetcore-build-phantomjs-chromium:2.0.3-jessie as builder +FROM squidex/aspnetcore-build-phantomjs-chromium:2.0.3-jessie-fix1 as builder COPY src/Squidex/package.json /tmp/package.json diff --git a/libs/Dockerfile b/libs/Dockerfile index 90cbae80f..e6155a35d 100644 --- a/libs/Dockerfile +++ b/libs/Dockerfile @@ -31,14 +31,14 @@ RUN apt-get update && apt-get install -yq libgconf-2-4 # Install latest chrome dev package and fonts to support major charsets (Chinese, Japanese, Arabic, Hebrew, Thai and a few others) RUN apt-get update && apt-get install -y wget --no-install-recommends \ - && wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \ - && sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \ - && apt-get update \ - && apt-get install -y google-chrome-unstable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst ttf-freefont \ - --no-install-recommends \ - && rm -rf /var/lib/apt/lists/* \ - && apt-get purge --auto-remove -y curl \ - && rm -rf /src/*.deb + && wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \ + && sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \ + && apt-get update \ + && apt-get install -y google-chrome-unstable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst ttf-freefont \ + --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + && apt-get autoremove -y \ + && rm -rf /src/*.deb # It's a good idea to use dumb-init to help prevent zombie chrome processes. ADD https://github.com/Yelp/dumb-init/releases/download/v1.2.0/dumb-init_1.2.0_amd64 /usr/local/bin/dumb-init