From 9b3b77bffc16b6446d87764c666f8a18ae868152 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Bylica?= <chfast@gmail.com>
Date: Wed, 13 Feb 2019 14:16:20 +0100
Subject: [PATCH 1/4] Circle CI: Fix docker build for Aleth

The scripts/dopple git submodule must be initiated before the build.
---
 circle.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index dac79827b98..6518d05a7b0 100644
--- a/circle.yml
+++ b/circle.yml
@@ -241,7 +241,7 @@ jobs:
       - checkout
       - run:
           name: "Update required git submodules"
-          command: git submodule update --init --recursive evmc cmake/cable
+          command: git submodule update --init --recursive cmake/cable evmc scripts/dopple
       - setup_remote_docker
       - run:
           name: "Build docker images"

From d61d0482da7ba02d550fca67cc582a12a7921a7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Bylica?= <chfast@gmail.com>
Date: Wed, 13 Feb 2019 14:23:27 +0100
Subject: [PATCH 2/4] Circle CI: Build with -DVMTRACE=ON

---
 circle.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/circle.yml b/circle.yml
index 6518d05a7b0..b0be607454e 100644
--- a/circle.yml
+++ b/circle.yml
@@ -133,7 +133,7 @@ jobs:
       GENERATOR: Ninja
       BUILD_PARALLEL_JOBS: 8
       TEST_PARALLEL_JOBS: 8
-      CMAKE_OPTIONS: -DALETH_INTERPRETER_SHARED=ON
+      CMAKE_OPTIONS: -DALETH_INTERPRETER_SHARED=ON -DVMTRACE=ON
     docker:
       - image: ethereum/cpp-build-env:7
     steps:
@@ -162,7 +162,7 @@ jobs:
       GENERATOR: Ninja
       BUILD_PARALLEL_JOBS: 3
       TEST_PARALLEL_JOBS: 4
-      CMAKE_OPTIONS: -DCOVERAGE=ON
+      CMAKE_OPTIONS: -DCOVERAGE=ON -DVMTRACE=ON
     docker:
       - image: ethereum/cpp-build-env:7
     steps:
@@ -185,7 +185,7 @@ jobs:
     <<: *linux-gcc6
     environment:
       <<: *linux-gcc6-environment
-      CMAKE_OPTIONS: -DCOVERAGE=ON -DTESTETH_ARGS=--all
+      CMAKE_OPTIONS: -DCOVERAGE=ON -DVMTRACE=ON -DTESTETH_ARGS=--all
 
   macos-xcode90:
     environment:
@@ -194,6 +194,7 @@ jobs:
       GENERATOR: Ninja
       BUILD_PARALLEL_JOBS: 8
       TEST_PARALLEL_JOBS: 8
+      CMAKE_OPTIONS: -DVMTRACE=ON
     macos:
       xcode: "9.0"
     steps:

From c047e3a4b7f082a73f76d0592890cac80450c8b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Bylica?= <chfast@gmail.com>
Date: Wed, 13 Feb 2019 14:17:30 +0100
Subject: [PATCH 3/4] docker: Build Aleth with -DVMTRACE=ON

---
 scripts/docker/aleth.dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/docker/aleth.dockerfile b/scripts/docker/aleth.dockerfile
index 5ff803de218..672919c6f0b 100644
--- a/scripts/docker/aleth.dockerfile
+++ b/scripts/docker/aleth.dockerfile
@@ -15,7 +15,7 @@ RUN apk add --no-cache \
         git
 ADD . /source
 WORKDIR /build
-RUN cmake /source -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DHUNTER_JOBS_NUMBER=$(nproc)
+RUN cmake /source -DVMTRACE=ON -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DHUNTER_JOBS_NUMBER=$(nproc)
 RUN make -j $(nproc) && make install
 
 # Target: testeth

From 307d39f35f9cec54bea588fe61d064f476c574f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Bylica?= <chfast@gmail.com>
Date: Wed, 13 Feb 2019 14:15:24 +0100
Subject: [PATCH 4/4] docker: Remove old Dockerfiles

---
 aleth.dockerfile   | 24 ------------------------
 testeth.dockerfile | 21 ---------------------
 2 files changed, 45 deletions(-)
 delete mode 100644 aleth.dockerfile
 delete mode 100644 testeth.dockerfile

diff --git a/aleth.dockerfile b/aleth.dockerfile
deleted file mode 100644
index bdbe32a2206..00000000000
--- a/aleth.dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Multistage Dockerfile for the Aleth Ethereum node.
-
-# Build stage
-FROM alpine:latest as builder
-RUN apk add --no-cache \
-        git \
-        cmake \
-        g++ \
-        make \
-        linux-headers
-ADD . /source
-WORKDIR /build
-RUN cmake /source -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DTOOLS=OFF -DTESTS=OFF -DHUNTER_JOBS_NUMBER=$(nproc)
-RUN make -j $(nproc) && make install
-
-# Install stage
-FROM alpine:latest
-RUN apk add --no-cache \
-        python3 \
-        libstdc++
-COPY --from=builder /usr/bin/aleth /source/scripts/aleth.py /source/scripts/jsonrpcproxy.py /usr/bin/
-COPY --from=builder /usr/share/aleth/ /usr/share/aleth/
-EXPOSE 8545
-ENTRYPOINT ["/usr/bin/aleth.py"]
diff --git a/testeth.dockerfile b/testeth.dockerfile
deleted file mode 100644
index aaa212625a4..00000000000
--- a/testeth.dockerfile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Multistage Dockerfile for the testeth tool.
-
-# Build stage
-FROM alpine:latest as builder
-RUN apk add --no-cache \
-        git \
-        cmake \
-        g++ \
-        make \
-        linux-headers
-ADD . /source
-WORKDIR /build
-RUN cmake /source -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DTOOLS=OFF -DHUNTER_JOBS_NUMBER=$(nproc)
-RUN make -j $(nproc) && make install
-
-# Install stage
-FROM alpine:latest
-RUN apk add --no-cache libstdc++
-COPY --from=builder /build/test/testeth /usr/bin/testeth
-
-ENTRYPOINT ["/usr/bin/testeth"]