Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump glob-parent from 3.1.0 to 5.1.2 #26

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+13,089 −29,031
Open

Bump glob-parent from 3.1.0 to 5.1.2 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d22bbb
docker same fix as in eth-writer
uv-orbs Mar 22, 2022
b967aae
Bump glob-parent from 3.1.0 to 5.1.2
dependabot[bot] Mar 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading