Skip to content
This repository has been archived by the owner on Oct 28, 2021. It is now read-only.

Commit

Permalink
Merge pull request #5490 from ethereum/docker
Browse files Browse the repository at this point in the history
Docker fix
  • Loading branch information
chfast authored Feb 14, 2019
2 parents 4754e7a + 307d39f commit 47ffdb6
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 50 deletions.
24 changes: 0 additions & 24 deletions aleth.dockerfile

This file was deleted.

9 changes: 5 additions & 4 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -194,6 +194,7 @@ jobs:
GENERATOR: Ninja
BUILD_PARALLEL_JOBS: 8
TEST_PARALLEL_JOBS: 8
CMAKE_OPTIONS: -DVMTRACE=ON
macos:
xcode: "9.0"
steps:
Expand Down Expand Up @@ -241,7 +242,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"
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/aleth.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
21 changes: 0 additions & 21 deletions testeth.dockerfile

This file was deleted.

0 comments on commit 47ffdb6

Please sign in to comment.