diff --git a/docker/base/Dockerfile b/docker/base/Dockerfile index 0b52efa2bb6..ee005b6af00 100644 --- a/docker/base/Dockerfile +++ b/docker/base/Dockerfile @@ -1,4 +1,4 @@ -FROM buildpack-deps:yakkety-curl +FROM buildpack-deps:zesty-curl # rpm is required for FPM to build rpm package # yasm is required to build p7zip @@ -19,8 +19,9 @@ ENV DEBUG_COLORS true ENV FORCE_COLOR true ENV DEBIAN_FRONTEND noninteractive +# locales for locale-gen RUN curl -L https://yarnpkg.com/latest.tar.gz | tar xvz && mv dist /yarn && apt-get update -y && apt-get upgrade -y && \ - apt-get install --no-install-recommends -y xvfb git snapcraft qtbase5-dev xorriso bsdtar build-essential autoconf libssl-dev icnsutils libopenjp2-7 graphicsmagick gcc-multilib g++-multilib libgnome-keyring-dev lzip rpm yasm python libcurl3 && \ + apt-get install --no-install-recommends -y locales xvfb git snapcraft qtbase5-dev xorriso bsdtar build-essential autoconf libssl-dev icnsutils libopenjp2-7 graphicsmagick gcc-multilib g++-multilib libgnome-keyring-dev lzip rpm yasm python libcurl3 && \ curl -O http://mirrors.kernel.org/ubuntu/pool/universe/libi/libicns/libicns1_0.8.1-3.1_amd64.deb && dpkg --install libicns1_0.8.1-3.1_amd64.deb && unlink libicns1_0.8.1-3.1_amd64.deb && \ wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && echo "deb 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-stable && \ diff --git a/docker/build.sh b/docker/build.sh index 464b0b4e92a..7859c86fdde 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -3,7 +3,7 @@ set -e docker build -t electronuserland/electron-builder:base docker/base -docker build -t electronuserland/electron-builder:7 -t electronuserland/electron-builder:latest docker/7 +docker build -t electronuserland/electron-builder:8 -t electronuserland/electron-builder:latest docker/8 docker build -t electronuserland/electron-builder:6 docker/6 docker build -t electronuserland/electron-builder:wine docker/wine \ No newline at end of file