From 59ec82f62f7e7572f5e02b7241492e682e1db195 Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Sat, 13 Feb 2016 00:40:43 +0900 Subject: [PATCH 1/2] Use Docker Hub to build docker image docker-build may fail due to fail apt-get --- circle.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index b5a8239c..3c9f2506 100644 --- a/circle.yml +++ b/circle.yml @@ -13,9 +13,9 @@ dependencies: cache_directories: - "~/.electron" post: - - docker build -t yuya-oc/em-builder docker + - docker pull yuyaoc/em-builder:dev - 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`:/home/xclient/electron-mattermost -v ~/.electron:/home/xclient/.electron yuyaoc/em-builder ./electron-mattermost/docker/package_in_docker.sh - mv release/electron-mattermost-win32-ia32 release/electron-mattermost-win32 - mv release/electron-mattermost-win32-x64 release/electron-mattermost-win64 - mv release/electron-mattermost-darwin-x64 release/electron-mattermost-osx From d81f000d9b5993239ff1ff088176dd3c09337275 Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Sat, 13 Feb 2016 00:48:56 +0900 Subject: [PATCH 2/2] Fix image tag to pull --- circle.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 3c9f2506..1f999941 100644 --- a/circle.yml +++ b/circle.yml @@ -13,9 +13,8 @@ dependencies: cache_directories: - "~/.electron" post: - - docker pull yuyaoc/em-builder:dev - mkdir -p ~/.electron - - docker run --rm -it -v `pwd`:/home/xclient/electron-mattermost -v ~/.electron:/home/xclient/.electron yuyaoc/em-builder ./electron-mattermost/docker/package_in_docker.sh + - docker run --rm -it -v `pwd`:/home/xclient/electron-mattermost -v ~/.electron:/home/xclient/.electron yuyaoc/em-builder:dev ./electron-mattermost/docker/package_in_docker.sh - mv release/electron-mattermost-win32-ia32 release/electron-mattermost-win32 - mv release/electron-mattermost-win32-x64 release/electron-mattermost-win64 - mv release/electron-mattermost-darwin-x64 release/electron-mattermost-osx