From 3a69e5139fa6c1a7ad5f55b0a86426f8fa2002c5 Mon Sep 17 00:00:00 2001 From: Cheran Date: Fri, 20 May 2022 20:08:46 +0530 Subject: [PATCH] [INF-104] Upgrade to node 16 to fix build errors (#3132) --- .circleci/config.yml | 24 ++++++++++++------------ contracts/Dockerfile | 6 +++--- eth-contracts/Dockerfile | 6 +++--- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c14a03ee3ec..36afc96372a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -16,7 +16,7 @@ commands: or: - equal: [master, << pipeline.git.branch >>] - matches: - pattern: "^release.*$" + pattern: '^release.*$' value: << pipeline.git.branch >> steps: - run: ./diff.sh << parameters.service >> || (echo "no diff" && circleci-agent step halt) @@ -91,8 +91,8 @@ jobs: test-mad-dog-e2e: parameters: mad-dog-type: - description: "test, test-nightly" - default: "test" + description: 'test, test-nightly' + default: 'test' type: string docker: - image: audius/circleci-gcloud-bake:latest @@ -155,11 +155,11 @@ jobs: - image: trufflesuite/ganache-cli:latest # https://discuss.circleci.com/t/docker-using-local-image/11581/9 # https://circleci.com/docs/2.0/configuration-reference/#docker - command: ["-l", "8000000", "-a", "50"] + command: ['-l', '8000000', '-a', '50'] - image: trufflesuite/ganache-cli:latest # https://discuss.circleci.com/t/docker-using-local-image/11581/9 # https://circleci.com/docs/2.0/configuration-reference/#docker - command: ["-l", "8000000", "-p", "8546", "-a", "50"] + command: ['-l', '8000000', '-p', '8546', '-a', '50'] # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images @@ -226,7 +226,7 @@ jobs: docker: - image: circleci/node:10.16.3 - image: trufflesuite/ganache-cli:latest - command: ["--port=8555", "-a", "100", "-l", "8000000"] + command: ['--port=8555', '-a', '100', '-l', '8000000'] steps: - checkout - diff-if-necessary: @@ -267,7 +267,7 @@ jobs: docker: - image: circleci/node:14.17.3 - image: trufflesuite/ganache-cli:latest - command: ["--port=8546", "-a", "50", "-l", "8000000"] + command: ['--port=8546', '-a', '50', '-l', '8000000'] steps: - checkout - diff-if-necessary: @@ -358,14 +358,14 @@ jobs: - cluster.name=docker-cluster - node.name=cluster1-node1 - xpack.security.enabled=false - - "ES_JAVA_OPTS=-Xms512m -Xmx512m" + - 'ES_JAVA_OPTS=-Xms512m -Xmx512m' - image: ipfs/go-ipfs:release # Bring up ganache - image: redis:3.0-alpine - image: trufflesuite/ganache-cli:latest - command: ["--port=8555", "-a", "100", "-l", "8000000"] + command: ['--port=8555', '-a', '100', '-l', '8000000'] - image: trufflesuite/ganache-cli:latest - command: ["--port=8556", "-a", "100", "-l", "8000000"] + command: ['--port=8556', '-a', '100', '-l', '8000000'] steps: - checkout - diff-if-necessary: @@ -444,7 +444,7 @@ jobs: - image: trufflesuite/ganache-cli:latest # https://discuss.circleci.com/t/docker-using-local-image/11581/9 # https://circleci.com/docs/2.0/configuration-reference/#docker - command: ["-l", "8000000"] + command: ['-l', '8000000'] - image: circleci/postgres:11.1 environment: POSTGRES_USER: postgres @@ -787,7 +787,7 @@ workflows: repo: solana-programs triggers: - schedule: - cron: "0 5 * * *" + cron: '0 5 * * *' filters: branches: only: /(^master$)/ diff --git a/contracts/Dockerfile b/contracts/Dockerfile index bf9520c2e7c..af44a06d2d7 100644 --- a/contracts/Dockerfile +++ b/contracts/Dockerfile @@ -4,17 +4,17 @@ # FROM audius-contracts:latest as contracts # COPY --from=contracts /usr/src/app/build/contracts/ ./build/contracts/ -FROM node:10.16 as builder +FROM node:16 as builder COPY package*.json ./ RUN npm install --loglevel verbose -FROM node:10.16-alpine +FROM node:16-slim WORKDIR /usr/src/app COPY --from=builder /node_modules ./node_modules COPY . . -RUN ./node_modules/.bin/truffle compile +RUN npx truffle compile ARG git_sha ENV GIT_SHA=$git_sha diff --git a/eth-contracts/Dockerfile b/eth-contracts/Dockerfile index 19808617a16..d2f2c6a1fb3 100644 --- a/eth-contracts/Dockerfile +++ b/eth-contracts/Dockerfile @@ -4,17 +4,17 @@ # FROM audius-eth-contracts:latest as eth-contracts # COPY --from=eth-contracts /usr/src/app/build/contracts/ ./build/contracts/ -FROM node:10.16 as builder +FROM node:16 as builder COPY package*.json ./ RUN npm install --loglevel verbose -FROM node:10.16-alpine +FROM node:16-slim WORKDIR /usr/src/app COPY --from=builder /node_modules ./node_modules COPY . . -RUN ./node_modules/.bin/truffle compile +RUN npx truffle compile ARG git_sha ENV GIT_SHA=$git_sha