fix: add debug to verify-pr-commit; add version to container

Author: Matthew Orris

.github/workflows/publish-dev-ci-base-image.yml

@@ -18,6 +18,7 @@ jobs:
       # IMAGE_NAME: ci-base-image-dind
       IMAGE_NAME: ci-base-image
       BRANCH_NAME: ${{github.ref_name}}
+      VERSION: 1.0.0
     runs-on: ubuntu-20.04
     steps:
       - name: Check Out Repo

.github/workflows/verify-pr-commit.yml

@@ -201,14 +201,15 @@ jobs:
       - name: Check
         # Remove these install commands when ci-base-image has nightly toolchain
         run: |
-          echo "***************************************-env"
-          env | grep VERSION
-          echo "***************************************-show"
-          rustup show
           echo "***************************************"
-          # rustup toolchain install nightly-2023-07-13
+          echo "ci-base-image version:"
+          docker inspect -f '{{ index .Config.Labels "version" }}' ci-base-image
+          echo "***************************************"
+          echo "USER:"
+          whoami
           echo "***************************************"
-          # rustup target add x86_64-unknown-linux-gnu --toolchain nightly-2023-07-13
+          echo "which cargo?"
+          type cargo
           echo "***************************************"
           cargo +nightly-2023-07-13 fmt --check
 

tools/ci/docker/ci-base-image.dockerfile

@@ -11,12 +11,18 @@ RUN apt-get update && \
 	curl -fsSL https://get.docker.com -o get-docker.sh && sh get-docker.sh && \
 	rm -rf /var/lib/apt/lists/*
 
-# Install Rust
+# Install Rustup
 RUN curl https://sh.rustup.rs -sSf | bash -s -- -y
 ENV PATH="/home/runner/.cargo/bin:/root/.cargo/bin:${PATH}"
 ENV RUSTUP_HOME="/root/.cargo"
 ENV CARGO_HOME="/root/.cargo"
-RUN rustup toolchain install nightly-2023-07-13
-RUN rustup target add x86_64-unknown-linux-gnu --toolchain nightly-2023-07-13
+# Install Rust toolchains
+RUN rustup show > /docker.build.log 2>&1 && \
+	rustup toolchain install 1.70.0 >> /docker.build.log 2>&1 && \
+	rustup toolchain install nightly-2023-07-13 >> /docker.build.log 2>&1 && \
+	rustup target add x86_64-unknown-linux-gnu --toolchain nightly-2023-07-13 >> /docker.build.log 2>&1 
+RUN rustup default 1.70.0 >> /docker.build.log 2>&1 && \
+	echo "**************************************" >> /docker.build.log && \
+	rustup show >> /docker.build.log 2>&1
 
 RUN git config --system --add safe.directory /__w/frequency/frequency