From 3a5e745bb2eb71cb2c7a598475d35d39c498b581 Mon Sep 17 00:00:00 2001
From: etienne-napoleone <etienne@tomochain.com>
Date: Wed, 20 Jun 2018 18:09:49 +0700
Subject: [PATCH 1/4] Add Dockerfile

---
 Dockerfile | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 29cdc80f967a..2e1601dec2c6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,19 @@
-# Build Geth in a stock Go builder container
 FROM golang:1.10-alpine as builder
 
 RUN apk add --no-cache make gcc musl-dev linux-headers
 
-ADD . /go-ethereum
-RUN cd /go-ethereum && make geth
+ADD . /tomochain
+RUN cd /tomochain && make tomo
 
-# Pull Geth into a second stage deploy alpine container
 FROM alpine:latest
 
-RUN apk add --no-cache ca-certificates
-COPY --from=builder /go-ethereum/build/bin/geth /usr/local/bin/
+LABEL maintainer="etienne@tomochain.com"
 
-EXPOSE 8545 8546 30303 30303/udp 30304/udp
-ENTRYPOINT ["geth"]
+COPY --from=builder /tomochain/build/bin/tomo /usr/local/bin/tomo
+
+RUN chmod +x /usr/local/bin/tomo
+
+EXPOSE 8545
+EXPOSE 30303
+
+ENTRYPOINT ["/usr/local/bin/tomo", "--help"]

From bb23882f777316380141a1414ace4959cdf0bcc9 Mon Sep 17 00:00:00 2001
From: etienne-napoleone <etienne@tomochain.com>
Date: Wed, 20 Jun 2018 18:11:57 +0700
Subject: [PATCH 2/4] Add basic docker cloud autotest

---
 docker-compose.test.yml | 11 +++++++++++
 docker/docker_tests.sh  |  3 +++
 2 files changed, 14 insertions(+)
 create mode 100644 docker-compose.test.yml
 create mode 100644 docker/docker_tests.sh

diff --git a/docker-compose.test.yml b/docker-compose.test.yml
new file mode 100644
index 000000000000..d4492eed5e37
--- /dev/null
+++ b/docker-compose.test.yml
@@ -0,0 +1,11 @@
+version: "3.4"
+
+services:
+
+  sut:
+    build: .
+    volumes:
+      - "./docker/run_tests.sh:/test/run_tests.sh"
+    entrypoint:
+      - /bin/sh
+      - /test/run_tests.sh
diff --git a/docker/docker_tests.sh b/docker/docker_tests.sh
new file mode 100644
index 000000000000..8f88919e2d7d
--- /dev/null
+++ b/docker/docker_tests.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+$(tomo --help | grep -q tomo)

From b2ab591c1b1218b67be93551baf473ea1b7aa019 Mon Sep 17 00:00:00 2001
From: etienne-napoleone <etienne@tomochain.com>
Date: Wed, 20 Jun 2018 18:12:42 +0700
Subject: [PATCH 3/4] Remove unused Dockerfile

---
 Dockerfile.alltools | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 Dockerfile.alltools

diff --git a/Dockerfile.alltools b/Dockerfile.alltools
deleted file mode 100644
index 1047738d25ac..000000000000
--- a/Dockerfile.alltools
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Geth in a stock Go builder container
-FROM golang:1.10-alpine as builder
-
-RUN apk add --no-cache make gcc musl-dev linux-headers
-
-ADD . /go-ethereum
-RUN cd /go-ethereum && make all
-
-# Pull all binaries into a second stage deploy alpine container
-FROM alpine:latest
-
-RUN apk add --no-cache ca-certificates
-COPY --from=builder /go-ethereum/build/bin/* /usr/local/bin/
-
-EXPOSE 8545 8546 30303 30303/udp 30304/udp

From 0d1807d86304556bea7dd2ddda9982b0a73096d7 Mon Sep 17 00:00:00 2001
From: Etienne Napoleone <etienne@tomochain.com>
Date: Wed, 20 Jun 2018 21:06:34 +0700
Subject: [PATCH 4/4] Fix path in the test docker-compose file

---
 docker-compose.test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index d4492eed5e37..987c266fd023 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -5,7 +5,7 @@ services:
   sut:
     build: .
     volumes:
-      - "./docker/run_tests.sh:/test/run_tests.sh"
+      - "./docker/docker_tests.sh:/test/docker_tests.sh"
     entrypoint:
       - /bin/sh
-      - /test/run_tests.sh
+      - /test/docker_tests.sh