From 8ce8bc7fe883aac48a8c706ec0f9ca9b8649fd57 Mon Sep 17 00:00:00 2001 From: Yihau Chen Date: Fri, 31 Jan 2025 02:51:25 +0800 Subject: [PATCH] ci: remove default args from the ci dockerfile (#4698) --- ci/docker/Dockerfile | 12 ++++++++---- ci/docker/README.md | 3 ++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ci/docker/Dockerfile b/ci/docker/Dockerfile index 2d10911512a91b..1fac4054fd2d63 100644 --- a/ci/docker/Dockerfile +++ b/ci/docker/Dockerfile @@ -4,10 +4,10 @@ FROM ${BASE_IMAGE} ARG \ RUST_VERSION= \ RUST_NIGHTLY_VERSION= \ - GOLANG_VERSION=1.21.3 \ - NODE_MAJOR=18 \ - SCCACHE_VERSION=v0.9.1 \ - GRCOV_VERSION=v0.8.18 + GOLANG_VERSION= \ + NODE_MAJOR= \ + SCCACHE_VERSION= \ + GRCOV_VERSION= SHELL ["/bin/bash", "-o", "pipefail", "-c"] @@ -27,6 +27,10 @@ ENV \ RUN \ if [ -z "$RUST_VERSION" ]; then echo "ERROR: The RUST_VERSION argument is required!" && exit 1; fi && \ if [ -z "$RUST_NIGHTLY_VERSION" ]; then echo "ERROR: The RUST_NIGHTLY_VERSION argument is required!" && exit 1; fi && \ + if [ -z "$GOLANG_VERSION" ]; then echo "ERROR: The GOLANG_VERSION argument is required!" && exit 1; fi && \ + if [ -z "$NODE_MAJOR" ]; then echo "ERROR: The NODE_MAJOR argument is required!" && exit 1; fi && \ + if [ -z "$SCCACHE_VERSION" ]; then echo "ERROR: The SCCACHE_VERSION argument is required!" && exit 1; fi && \ + if [ -z "$GRCOV_VERSION" ]; then echo "ERROR: The GRCOV_VERSION argument is required!" && exit 1; fi && \ apt-get update && \ apt-get install --no-install-recommends -y \ # basic diff --git a/ci/docker/README.md b/ci/docker/README.md index 58bd9accdb14a1..b0edf7e4b60850 100644 --- a/ci/docker/README.md +++ b/ci/docker/README.md @@ -6,6 +6,7 @@ This image is manually maintained: 1. Edit 1. `ci/rust-version.sh` for rust and rust nightly version - 2. `ci/docker/Dockerfile` for other packages + 2. `ci/docker/env.sh` for some environment variables + 3. `ci/docker/Dockerfile` for some other packages 2. Ensure you're a member of the [Solana Docker Hub Organization](https://hub.docker.com/u/solanalabs/) and already `docker login` 3. Run `ci/docker/build.sh` to build/publish the new image