Merge branch 'windows-installer' into dev

Close #146
This commit is contained in:
Yuya Ochiai
2016-06-12 17:00:03 +09:00
4 changed files with 2 additions and 32 deletions

View File

@@ -13,11 +13,10 @@ dependencies:
cache_directories:
- "~/.electron"
- "src/node_modules"
- "~/docker_cache"
post:
- ./docker/circle_docker_build.sh
- mkdir -p ~/.electron
- docker run --rm -it -v `pwd`:/home/xclient/electron-mattermost -v ~/.electron:/home/xclient/.electron yuya-oc/em-builder ./electron-mattermost/docker/package_in_docker.sh
- docker run --rm -it -v `pwd`:/project -v ~/.electron:/root/.electron electronuserland/electron-builder:wine ./docker/package_in_docker.sh
- sudo chown -R ubuntu:ubuntu release
- mv release/Mattermost-win32-ia32 release/mattermost-desktop-win32
- mv release/Mattermost-win32-x64 release/mattermost-desktop-win64
- mv release/Mattermost-darwin-x64 release/mattermost-desktop-osx

View File

@@ -1,15 +0,0 @@
FROM suchja/wine:latest
MAINTAINER Yuya Ochiai <yuya0321@gmail.com>
ENV NODE_VERSION=v6.1.0
ENV PATH=$HOME/.nodebrew/current/bin:$PATH
USER root
RUN apt-get update && apt-get -y install wget bzip2 zip
# electron-builder
RUN apt-get update && apt-get -y install ruby ruby-dev gcc make icnsutils graphicsmagick xz-utils && gem install fpm
USER xclient
# install Node.js
RUN curl -L git.io/nodebrew | perl - setup && nodebrew install-binary $NODE_VERSION && nodebrew use $NODE_VERSION

View File

@@ -1,13 +0,0 @@
#!/bin/sh
# execute from source root
set -ex
CACHE_DIR=~/docker_cache
if [ -e ${CACHE_DIR}/em-builder.tar ] && md5sum -c ${CACHE_DIR}/dockerfile.md5sum
then
docker load < ${CACHE_DIR}/em-builder.tar
else
mkdir -p ${CACHE_DIR}
docker build -t yuya-oc/em-builder docker
md5sum docker/Dockerfile > ${CACHE_DIR}/dockerfile.md5sum
docker save yuya-oc/em-builder > ${CACHE_DIR}/em-builder.tar
fi

View File

@@ -1,7 +1,6 @@
#!/bin/sh
# This script should be executed in docker container.
set -ex
cd electron-mattermost
npm run package:all
npm run package:linux
npm run installer