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

Update celotool container image #10821

Merged
merged 10 commits into from
Dec 14, 2023
Merged

Update celotool container image #10821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3ad6b64
Build linux/arm64 celotool image. Update container workflow
jcortejoso Dec 11, 2023
4590e55
Update packages to reduce vulnerabilities. Using go 1.18
jcortejoso Dec 11, 2023
8e6c7ad
Increase GCP token timeout to 6 hours
jcortejoso Dec 11, 2023
a280475
Update vscode import syntax
jcortejoso Dec 12, 2023
47271ac
GCP credential timeout in seconds
jcortejoso Dec 12, 2023
364a0ac
Enable ARM for celotool image
jcortejoso Dec 13, 2023
470ff7b
Update node version
jcortejoso Dec 14, 2023
e283463
Merge branch 'master' of github.com:celo-org/celo-monorepo into jcort…
jcortejoso Dec 14, 2023
ca5c5cd
Minor
jcortejoso Dec 14, 2023
bf6ba2c
Merge branch 'jcortejoso/update-celotool-container' of github.com:cel…
jcortejoso Dec 14, 2023
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: 2 additions & 0 deletions .github/workflows/containers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ jobs:
service-account: '[email protected]'
artifact-registry: us-west1-docker.pkg.dev/devopsre/dev-images/celotool
tags: ${{ github.sha }}
platforms: linux/amd64
context: .
file: dockerfiles/celotool/Dockerfile
trivy: true
Expand All @@ -56,6 +57,7 @@ jobs:
service-account: '[email protected]'
artifact-registry: us-west1-docker.pkg.dev/devopsre/celo-monorepo/celotool
tags: ${{ github.sha }}
platforms: linux/amd64
context: .
file: dockerfiles/celotool/Dockerfile
trivy: true
Expand Down
11 changes: 8 additions & 3 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
"typescript.preferences.importModuleSpecifier": "non-relative",
"typescript.updateImportsOnFileMove.enabled": "always",
"editor.codeActionsOnSave": {
"source.organizeImports": false
"source.organizeImports": "never"
},
"[javascript]": {
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.organizeImports": false
"source.organizeImports": "never"
}
},
"[javascriptreact]": {
Expand All @@ -44,5 +44,10 @@
"editor.tabSize": 2,
"editor.detectIndentation": false,
"tslint.jsEnable": true,
"typescript.tsdk": "node_modules/typescript/lib"
"typescript.tsdk": "node_modules/typescript/lib",
"[javascriptreact][typescript][typescriptreact]": {
"editor.codeActionsOnSave": {
"source.organizeImports": "explicit"
}
}
}
3 changes: 2 additions & 1 deletion dockerfiles/celotool/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ WORKDIR /celo-monorepo

# Needed for gsutil
RUN apt-get update && \
apt-get upgrade -y && \
apt-get install -y lsb-release && \
apt-get install -y curl build-essential git python3 && \
export CLOUD_SDK_REPO="cloud-sdk-$(lsb_release -c -s)" && \
Expand Down Expand Up @@ -68,7 +69,7 @@ RUN rm .gitmodules

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

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

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

Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/cli-standalone/Dockerfile
View file
Open in desktop
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:12-alpine
FROM node:20-alpine
LABEL org.opencontainers.image.authors="[email protected]"

# Install cli install dependencies.
Expand Down
Loading