From e48e76acdf98831f560ad12dad1a61d4e8ebf616 Mon Sep 17 00:00:00 2001
From: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com>
Date: Mon, 6 Feb 2023 10:33:01 +0800
Subject: [PATCH] build: add nightly-2022-12-10 rust-related builder image
 (#282)

---
 build/dockerfiles/intermediate/Makefile                       | 2 +-
 build/dockerfiles/intermediate/go-alpine-builder.Dockerfile   | 2 +-
 .../intermediate/go-rust-alpine-builder.Dockerfile            | 4 ++--
 build/dockerfiles/intermediate/go-rust-builder.Dockerfile     | 2 +-
 build/dockerfiles/intermediate/rust-alpine-builder.Dockerfile | 3 ++-
 build/dockerfiles/intermediate/rust-builder.Dockerfile        | 2 +-
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/build/dockerfiles/intermediate/Makefile b/build/dockerfiles/intermediate/Makefile
index 4894469d8..a70adc5d1 100644
--- a/build/dockerfiles/intermediate/Makefile
+++ b/build/dockerfiles/intermediate/Makefile
@@ -1,6 +1,6 @@
 GO_VERSION := 1.18
 PYTHON_VERSION := 3.10
-RUST_VERSION := nightly-2022-08-23
+RUST_VERSION := nightly-2022-12-10
 
 .PHONY: all go-alpine-builder rust-builder rust-alpine-builder go-rust-alpine-builder go-rust-builder py-runner
 
diff --git a/build/dockerfiles/intermediate/go-alpine-builder.Dockerfile b/build/dockerfiles/intermediate/go-alpine-builder.Dockerfile
index 83e511c23..08db5b334 100644
--- a/build/dockerfiles/intermediate/go-alpine-builder.Dockerfile
+++ b/build/dockerfiles/intermediate/go-alpine-builder.Dockerfile
@@ -4,4 +4,4 @@ FROM golang:1.18-alpine
 
 # RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories
 
-RUN apk add --no-cache gcc musl-dev linux-headers git ca-certificates
+RUN apk add --no-cache gcc musl-dev linux-headers git ca-certificates openssl-dev
diff --git a/build/dockerfiles/intermediate/go-rust-alpine-builder.Dockerfile b/build/dockerfiles/intermediate/go-rust-alpine-builder.Dockerfile
index 2c46056ba..a90ccee1e 100644
--- a/build/dockerfiles/intermediate/go-rust-alpine-builder.Dockerfile
+++ b/build/dockerfiles/intermediate/go-rust-alpine-builder.Dockerfile
@@ -1,8 +1,8 @@
 FROM golang:1.18-alpine
 ARG CARGO_CHEF_TAG=0.1.41
-ARG DEFAULT_RUST_TOOLCHAIN=nightly-2022-08-23
+ARG DEFAULT_RUST_TOOLCHAIN=nightly-2022-12-10
 
-RUN apk add --no-cache gcc musl-dev linux-headers git ca-certificates
+RUN apk add --no-cache gcc musl-dev linux-headers git ca-certificates openssl-dev
 
 # RUN apk add --no-cache libc6-compat
 # RUN apk add --no-cache gcompat
diff --git a/build/dockerfiles/intermediate/go-rust-builder.Dockerfile b/build/dockerfiles/intermediate/go-rust-builder.Dockerfile
index 878643c6b..6fb532d11 100644
--- a/build/dockerfiles/intermediate/go-rust-builder.Dockerfile
+++ b/build/dockerfiles/intermediate/go-rust-builder.Dockerfile
@@ -14,7 +14,7 @@ ENV PATH="/root/.cargo/bin:${PATH}"
 ENV CARGO_HOME=/root/.cargo
 
 # Add Toolchain
-RUN rustup toolchain install nightly-2022-08-23
+RUN rustup toolchain install nightly-2022-12-10
 
 # TODO: make this ARG
 ENV CARGO_CHEF_TAG=0.1.41
diff --git a/build/dockerfiles/intermediate/rust-alpine-builder.Dockerfile b/build/dockerfiles/intermediate/rust-alpine-builder.Dockerfile
index 05466fc5c..1cc0c40d2 100644
--- a/build/dockerfiles/intermediate/rust-alpine-builder.Dockerfile
+++ b/build/dockerfiles/intermediate/rust-alpine-builder.Dockerfile
@@ -1,10 +1,11 @@
 ARG ALPINE_VERSION=3.15
 FROM alpine:${ALPINE_VERSION}
 ARG CARGO_CHEF_TAG=0.1.41
-ARG DEFAULT_RUST_TOOLCHAIN=nightly-2022-08-23
+ARG DEFAULT_RUST_TOOLCHAIN=nightly-2022-12-10
 
 RUN apk add --no-cache \
         ca-certificates \
+        openssl-dev \
         gcc \
         git \
         musl-dev
diff --git a/build/dockerfiles/intermediate/rust-builder.Dockerfile b/build/dockerfiles/intermediate/rust-builder.Dockerfile
index ab5238267..0dcdaca17 100644
--- a/build/dockerfiles/intermediate/rust-builder.Dockerfile
+++ b/build/dockerfiles/intermediate/rust-builder.Dockerfile
@@ -13,4 +13,4 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 ENV PATH="/root/.cargo/bin:${PATH}"
 
 # Add Toolchain
-RUN rustup toolchain install nightly-2022-08-23
+RUN rustup toolchain install nightly-2022-12-10