use rust version from env

.github/workflows/docker-publish.yml

@@ -38,8 +38,11 @@ jobs:
       # Build and push the image
       - name: Build and Push Image
         uses: docker/build-push-action@v2
+        run: |
+          source ci/rust-version.sh
         with:
           context: .
+          args: ${{ env.RUST_STABLE }}
           push: true
           tags: |
             ${{ env.REGISTRY }}/${{ env.ORG }}/${{ env.IMAGE }}:${{ github.sha }}

.github/workflows/test.yml

@@ -46,7 +46,9 @@ jobs:
             ~/.cargo/git/db/
             target/
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-          restore-keys: ${{ runner.os }}-cargo-
+          restore-keys: |
+            ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+            ${{ runner.os }}-cargo-
 
       - name: cargo fmt
         uses: actions-rs/cargo@v1

Dockerfile

@@ -1,6 +1,9 @@
 # syntax = docker/dockerfile:1.2
+
+ARG RUST_TOOLCHAIN_VERSION
+
 # Base image containing all binaries, deployed to gcr.io/mango-markets/mango-geyser-services:latest
-FROM rust:1.71.1-bullseye as base
+FROM rust:${RUST_TOOLCHAIN_VERSION}-bullseye as base
 RUN cargo install cargo-chef
 RUN rustup component add rustfmt
 RUN apt-get update && apt-get install -y clang cmake ssh