From 0f7e093c904041037d60c10711cdbfcd1c870659 Mon Sep 17 00:00:00 2001
From: Kiyoshi Ikehara <kiyoshi.ikehara@gree.net>
Date: Mon, 10 Nov 2014 10:51:05 +0900
Subject: [PATCH 1/2] Add circle.yml and Dockerfile to test flare on circle-ci

---
 Dockerfile | 31 +++++++++++++++++++++++++++++++
 circle.yml | 13 +++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 Dockerfile
 create mode 100644 circle.yml

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 00000000..86c2dca5
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,31 @@
+FROM ubuntu:14.04
+RUN apt-get -y update
+RUN apt-get -y --force-yes install cutter-testing-framework
+RUN apt-get -y --force-yes install \
+        autoconf \
+        automake \
+        libtool \
+        make \
+        gcc \
+        g++ \
+        libboost-all-dev \
+        zlib1g-dev \
+        libncursesw5 \
+        git \
+        libhashkit-dev \
+        libtokyocabinet-dev \
+        libkyotocabinet-dev \
+        uuid-dev \
+        libsqlite3-dev \
+        libncurses5-dev \
+        libcurl4-openssl-dev \
+        devscripts \
+        git-buildpackage && \
+    apt-get clean
+
+ADD . /tmp/flare
+RUN cd /tmp/flare && ./autogen.sh && ./configure && make && make install
+RUN cd /tmp/flare/test && bash ./run-tests.sh
+
+CMD ["/usr/local/bin/flared", "-f", "/etc/flared.conf"]
+
diff --git a/circle.yml b/circle.yml
new file mode 100644
index 00000000..aa2409d4
--- /dev/null
+++ b/circle.yml
@@ -0,0 +1,13 @@
+machine:
+  timezone: Asia/Tokyo
+  services:
+    - docker
+
+dependencies:
+  override:
+    - docker info
+    - docker build -t gree/flare .
+
+test:
+  override:
+    - docker run -d -p 12121:12121 gree/flare

From 6de54de042d34b1347f3ff6d018fd5e112daaaa9 Mon Sep 17 00:00:00 2001
From: Kiyoshi Ikehara <kiyoshi.ikehara@gree.net>
Date: Mon, 10 Nov 2014 15:28:39 +0900
Subject: [PATCH 2/2] XXX rm .travis.yml

---
 .travis.yml | 48 ------------------------------------------------
 1 file changed, 48 deletions(-)
 delete mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 796552c7..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-language: cpp
-
-env:
-  global:
-    - secure: "MQ3t1c/4Tl+Gqi9c/kWB2Uw++LL7D5y2v1lQSYzvs0XmN3eGQBKBCIlnaNUMsxjeH/szYkJW20kwu3flyY6XG8g/psdnphxah8LisTiBcBaWHXxomX1kVJ/Jg1ysjwGODZFKWgT5NovYRo7pej1wFfk0355bRQcj7Q0714SMvW8="
-
-compiler:
-  - gcc
-  - clang
-
-
-addons:
-  coverity_scan:
-    project:
-      name: "gree/flare"
-      description: "my own flare repo"
-    build_command_prepend: "./configure"
-    build_command: "make -j4"
-    branch_pattern: develop
-
-matrix:
-  allow_failures:
-    - compiler: clang
-
-before_install:
-  - travis_retry sudo add-apt-repository -y ppa:hvr/ghc
-  - travis_retry sudo apt-get update
-  - travis_retry sudo apt-get install libtokyocabinet-dev
-  - travis_retry sudo apt-get install libboost-program-options-dev libboost-regex-dev libboost-serialization-dev libboost-thread-dev libboost-system-dev
-  - travis_retry sudo apt-get install uuid-dev
-  - travis_retry sudo apt-get install cutter-testing-framework
-  - travis_retry sudo apt-get install cabal-install-1.18 ghc-7.6.3
-  - travis_retry sudo apt-get install git
-  - export PATH=$HOME/.cabal/bin:/opt/ghc/7.6.3/bin:/opt/cabal/1.18/bin:$PATH
-  - git clone https://github.com/gree/flare-tests.git
-  - cabal update
-  - cabal install flare-tests/
-
-before_script:
-  - travis_retry ./autogen.sh
-  - travis_retry ./configure
-  - mv test/run-tests.travis.sh test/run-tests.sh
-
-script:
-  - make
-  - make check && sudo make install
-  - flare-tests
-