Skip to content

Commit

Permalink
feat(docker): upgrade to zesty
Browse files Browse the repository at this point in the history
  • Loading branch information
develar committed Jun 6, 2017
1 parent 66771d3 commit da1734e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions docker/base/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 && \
Expand Down
2 changes: 1 addition & 1 deletion docker/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit da1734e

Please sign in to comment.