Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ build-ganache:
docker build -t vegaprotocol/ganache:local ./ganache

.PHONY: build-timescaledb
build-ganache:
build-timescaledb:
docker build -t vegaprotocol/timescaledb:local ./timescaledb
9 changes: 4 additions & 5 deletions smartcontracts-base/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,27 +1,26 @@
FROM ethereum/solc:0.8.8 AS solc088
FROM ethereum/solc:0.8.1 AS solc081

FROM node:16-alpine AS builder
FROM node:20-alpine AS builder
RUN mkdir /app
WORKDIR /app
ENV PATH="$PATH:/app/node_modules/.bin"
RUN apk update
RUN apk add ca-certificates curl
RUN apk add gcc g++ git make python3
RUN \
npm install -g node-gyp@latest && \
npm config set node_gyp "/usr/local/lib/node_modules/node-gyp/bin/node-gyp.js"
npm install -g node-gyp@latest --force
ADD package.json package-lock.json ./
RUN npm install

# # #

FROM node:16-alpine
FROM node:20-alpine
LABEL org.opencontainers.image.source https://github.com/vegaprotocol/devops-infra
RUN mkdir /app
WORKDIR /app
ENV PATH="$PATH:/app/node_modules/.bin"
RUN apk add --no-cache bash jq
RUN apk add --no-cache bash jq openssl gcompat

COPY --from=solc088 /usr/bin/solc /usr/bin/solc-v0.8.8
COPY --from=solc081 /usr/bin/solc /usr/bin/solc-v0.8.1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ module.exports = async function (deployer) {
process.exit(2);
}

const wallet = ethers.Wallet.fromMnemonic(ganmacheMnemonic)
const wallet = ethers.Wallet.fromPhrase(ganmacheMnemonic)
let privkey = wallet.privateKey.substr(2);
let pubkey = wallet.address;

Expand Down
Loading