Skip to content

Commit

Permalink
Dockerized CI fix
Browse files Browse the repository at this point in the history
  • Loading branch information
izelnakri committed Mar 4, 2020
1 parent a51eea0 commit e3dfcbb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
3 changes: 2 additions & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
_build
_build/
node_modules/
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ ENV MIX_ENV=$MIX_ENV

WORKDIR /code

RUN apt-get update && apt-get -y install procps autoconf libtool libgmp3-dev git curl make build-essential && \
RUN apt-get update && apt-get -y install python procps autoconf libtool libgmp3-dev git curl make build-essential && \
curl https://get.volta.sh | bash

ENV PATH=$PATH:/root/.volta/bin

RUN volta install node@8.17

ADD ["package.json", "package-lock.json"]
ADD ["package.json", "package-lock.json", "/code/"]

RUN npm install

Expand Down
5 changes: 1 addition & 4 deletions test/support/eth_client.exs
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,8 @@ defmodule ETH.TestClient do
# this makes the process hang, maybe with elixir ports we can intercept?
end)

wait_until_the_port_is_open()
wait_until_the_port_is_open() # NOTE: since couldnt find a way to intercept the testrpc init no way to know when test blockchain actually starts
advance_block_by(1)

# Process.sleep(4000 + @block_time) # NOTE: since couldnt find a way to intercept the testrpc init no way to know when test blockchain actually starts
end

def stop do
Expand All @@ -28,7 +26,6 @@ defmodule ETH.TestClient do
wait_until_next_block(block_no_during_function_call)

if block_count > 1 do
# NOTE: it was 50 kind , isthis is needed probably because JS timers/setInterval etc are problematic?
Process.sleep(block_count * @block_time - @block_time)
end
end
Expand Down

0 comments on commit e3dfcbb

Please # to comment.