Skip to content

Commit

Permalink
[versions] bump node and golang to modern versions
Browse files Browse the repository at this point in the history
  • Loading branch information
drew-u410 committed Apr 4, 2023
1 parent 24fe867 commit 72f24d8
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
12.22.7
18.15.0
5 changes: 2 additions & 3 deletions dockerfiles/celotool/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:12
FROM node:18
WORKDIR /celo-monorepo

# Needed for gsutil
Expand Down Expand Up @@ -63,9 +63,8 @@ RUN yarn build

ENV PATH="/celo-monorepo/packages/celotool/bin:${PATH}"

COPY --from=golang:1.16-stretch /usr/local/go/ /usr/local/go/
COPY --from=golang:1.19-stretch /usr/local/go/ /usr/local/go/

ENV PATH="/usr/local/go/bin:${PATH}"

CMD ["celotooljs.sh"]

10 changes: 5 additions & 5 deletions dockerfiles/circleci/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM circleci/node:10
FROM circleci/node:18
MAINTAINER Connor McEwen <[email protected]>

RUN sudo apt-get update -y
Expand All @@ -16,17 +16,17 @@ RUN export CLOUD_SDK_REPO="cloud-sdk-$(lsb_release -c -s)" && \
curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add - && \
sudo apt-get update -y && sudo apt-get install google-cloud-sdk -y

RUN sudo wget https://dl.google.com/go/go1.13.5.linux-amd64.tar.gz && \
sudo tar xf go1.13.5.linux-amd64.tar.gz -C /usr/local
RUN sudo wget https://dl.google.com/go/go1.19.7.linux-amd64.tar.gz && \
sudo tar xf go1.19.7.linux-amd64.tar.gz -C /usr/local

RUN curl https://sh.rustup.rs -sSf | sh -s -- -y

ENV PATH="/usr/local/go/bin:/home/circleci/.cargo/bin:${PATH}"

RUN go version

RUN rustup install 1.41.0 && \
rustup default 1.41.0
RUN rustup install 1.68.2 && \
rustup default 1.68.2

RUN mkdir ~/.ssh/ && echo -e "Host github.com\n\tStrictHostKeyChecking no\n" > ~/.ssh/config

Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/cli-standalone/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Example build command:
#
# VERSION=x.y.z; docker build . --build-arg VERSION=$VERSION -t gcr.io/celo-testnet/celocli-standalone:$VERSION
FROM node:10-alpine
FROM node:18-alpine

# Install cli install dependencies.
RUN apk add --no-cache python git make gcc g++ bash libusb-dev linux-headers eudev-dev
Expand Down
4 changes: 2 additions & 2 deletions dockerfiles/cli/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ ADD https://www.googleapis.com/storage/v1/b/genesis_blocks/o/${celo_env}?alt=med
ADD https://www.googleapis.com/storage/v1/b/static_nodes/o/${celo_env}?alt=media /celo/static-nodes.json

# Build Celocli
FROM node:10-alpine as node
FROM node:18-alpine as node

ARG celo_env

Expand All @@ -46,7 +46,7 @@ WORKDIR /celo-monorepo/
RUN npm install @celo/celocli

# Build the combined image
FROM node:10-alpine as final_image
FROM node:18-alpine as final_image

ARG network_name="alfajores"
ARG network_id="44787"
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/cloudbuild/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:12
FROM node:18

RUN apt-get update -y
RUN apt-get install lsb-release libudev-dev libusb-dev -y --no-install-recommends apt-utils
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/leaderboard/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:12
FROM node:18
WORKDIR /celo-monorepo

# ensure yarn.lock is evaluated by kaniko cache diff
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/metadata-crawler/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:12
FROM node:18
WORKDIR /celo-monorepo

RUN apt-get update && \
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/phone-number-privacy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ COPY packages/sdk/wallets/wallet-local packages/sdk/wallets/wallet-local
COPY packages/sdk/wallets/wallet-remote packages/sdk/wallets/wallet-remote

##### Main stage
FROM node:12
FROM node:18

WORKDIR /celo-phone-number-privacy/

Expand Down

0 comments on commit 72f24d8

Please sign in to comment.