From 44c72a78aae861e7abfc4a80b6f429394094733a Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Thu, 14 Apr 2016 22:53:50 +0900 Subject: [PATCH 1/6] Stop using Docker Hub --- circle.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 1ac6199e..e3b5d70c 100644 --- a/circle.yml +++ b/circle.yml @@ -16,8 +16,9 @@ dependencies: pre: - npm install -g npm@3.3.12 post: + - docker build -t yuya-oc/em-builder docker - mkdir -p ~/.electron - - 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 + - docker run --rm -it -v `pwd`:/home/xclient/electron-mattermost -v ~/.electron:/home/xclient/.electron yuya-oc/em-builder:dev ./electron-mattermost/docker/package_in_docker.sh - 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 From ab6b1359e95395e0be5add6304f49605bebd7838 Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Thu, 14 Apr 2016 23:04:10 +0900 Subject: [PATCH 2/6] Fix mistake on reverting --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index e3b5d70c..27ec2e55 100644 --- a/circle.yml +++ b/circle.yml @@ -18,7 +18,7 @@ dependencies: post: - docker build -t yuya-oc/em-builder docker - mkdir -p ~/.electron - - docker run --rm -it -v `pwd`:/home/xclient/electron-mattermost -v ~/.electron:/home/xclient/.electron yuya-oc/em-builder:dev ./electron-mattermost/docker/package_in_docker.sh + - 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 - 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 From 3e5af1234462900b8187fba338ce28fc67810722 Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Thu, 14 Apr 2016 23:28:41 +0900 Subject: [PATCH 3/6] Cache the docker image --- circle.yml | 3 ++- docker/circle_docker_build.sh | 13 +++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 docker/circle_docker_build.sh diff --git a/circle.yml b/circle.yml index 27ec2e55..a74708fa 100644 --- a/circle.yml +++ b/circle.yml @@ -13,10 +13,11 @@ dependencies: cache_directories: - "~/.electron" - "src/node_modules" + - "~/docker_cache" pre: - npm install -g npm@3.3.12 post: - - docker build -t yuya-oc/em-builder docker + - ./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 - mv release/Mattermost-win32-ia32 release/mattermost-desktop-win32 diff --git a/docker/circle_docker_build.sh b/docker/circle_docker_build.sh new file mode 100644 index 00000000..50841af6 --- /dev/null +++ b/docker/circle_docker_build.sh @@ -0,0 +1,13 @@ +#!/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 Dockerfile > ${CACHE_DIR}/dockerfile.md5sum + docker save yuya-oc/em-builder > ${CACHE_DIR}/em-builder.tar +fi From 217cab92413d98bcb29e48106dd5557a0a085b6d Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Thu, 14 Apr 2016 23:37:31 +0900 Subject: [PATCH 4/6] chmod +x docker/circle_docker_build.sh --- docker/circle_docker_build.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 docker/circle_docker_build.sh diff --git a/docker/circle_docker_build.sh b/docker/circle_docker_build.sh old mode 100644 new mode 100755 From 1b377d2888cbf50973e1a643128b55db74f0bce5 Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Thu, 14 Apr 2016 23:42:14 +0900 Subject: [PATCH 5/6] Fix line encoding --- docker/circle_docker_build.sh | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/docker/circle_docker_build.sh b/docker/circle_docker_build.sh index 50841af6..54f7f825 100755 --- a/docker/circle_docker_build.sh +++ b/docker/circle_docker_build.sh @@ -1,13 +1,13 @@ -#!/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 Dockerfile > ${CACHE_DIR}/dockerfile.md5sum - docker save yuya-oc/em-builder > ${CACHE_DIR}/em-builder.tar -fi +#!/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 Dockerfile > ${CACHE_DIR}/dockerfile.md5sum + docker save yuya-oc/em-builder > ${CACHE_DIR}/em-builder.tar +fi From 81981e18ae342978e2d247579c5665263a288122 Mon Sep 17 00:00:00 2001 From: Yuya Ochiai Date: Thu, 14 Apr 2016 23:59:24 +0900 Subject: [PATCH 6/6] Fix the script --- docker/circle_docker_build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/circle_docker_build.sh b/docker/circle_docker_build.sh index 54f7f825..0995e57f 100755 --- a/docker/circle_docker_build.sh +++ b/docker/circle_docker_build.sh @@ -4,10 +4,10 @@ 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 + docker load < ${CACHE_DIR}/em-builder.tar else mkdir -p ${CACHE_DIR} docker build -t yuya-oc/em-builder docker - md5sum Dockerfile > ${CACHE_DIR}/dockerfile.md5sum + md5sum docker/Dockerfile > ${CACHE_DIR}/dockerfile.md5sum docker save yuya-oc/em-builder > ${CACHE_DIR}/em-builder.tar fi