Skip to content

Commit

Permalink
docker same fix as in eth-writer
Browse files Browse the repository at this point in the history
  • Loading branch information
uv-orbs committed Mar 22, 2022
1 parent 93cd35c commit 9d22bbb
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 12 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ WORKDIR /opt/orbs
COPY package*.json ./
COPY .version ./version

RUN apk add --no-cache git

# see https://github.com/nodejs/docker-node/issues/282

# --no-cache: download package index on-the-fly, no need to cleanup afterwards
Expand All @@ -20,7 +18,9 @@ RUN apk --no-cache --virtual build-dependencies add \
&& npm install \
&& apk del build-dependencies

RUN npm install

RUN apk add --no-cache git
RUN npm install

COPY dist ./dist

Expand Down
3 changes: 2 additions & 1 deletion e2e/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ services:
context: .
dockerfile: ./Dockerfile-app.test
signer:
image: orbsnetwork/signer:experimental
#image: orbsnetwork/signer:experimental
image: orbsnetwork/signer:v2.4.0
ports:
- 7777:7777
volumes:
Expand Down
6 changes: 4 additions & 2 deletions e2e/driver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export class TestEnvironment {
// step 2 - let ganache warm up
test.serial.before(async (t) => {
t.log('[E2E] wait 5 seconds for ganache to warm up');
await sleep(5000);
await sleep(15000);
});

// step 3 - deploy ethereum PoS contracts to ganache
Expand Down Expand Up @@ -122,7 +122,9 @@ export class TestEnvironment {
t.timeout(60 * 1000);
// note that gamma virtual chain id is always hard-coded as 42
const gammaAddress = await getAddressForService(this.envName, this.pathToDockerCompose, 'chain-42', 8080);
this.gammaDriver = await new GammaDriver().init(`http://localhost:${portFromAddress(gammaAddress)}`, 42);
const gammaUrl = `http://localhost:${portFromAddress(gammaAddress)}`
t.log(`gammaUrl URL ${gammaUrl}`)
this.gammaDriver = await new GammaDriver().init(gammaUrl, 42);
});

// step 5 - write config file for app
Expand Down
7 changes: 1 addition & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 9d22bbb

Please sign in to comment.