From 485d8f2c0b83a7bf54a3df7c8f0b8e287c2e3abe Mon Sep 17 00:00:00 2001
From: TommyLike <tommylikehu@gmail.com>
Date: Mon, 28 Aug 2023 12:54:27 +0800
Subject: [PATCH] Restrict toolchain version in dockerfile and jenkinsfile

---
 Jenkinsfile                      | 6 +++---
 docker/Dockerfile                | 2 +-
 docker/Dockerfile.control-server | 2 +-
 docker/Dockerfile.data-server    | 3 +--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index b33df08..2f334a2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -66,7 +66,7 @@ EOF
 				sh '''#!/bin/bash
 				
 				source $HOME/.cargo/env && cd PR-$giteePullRequestIid
-				cargo  +nightly clippy
+				cargo clippy
 				'''
 			}
 		}
@@ -75,7 +75,7 @@ EOF
 				sh '''#!/bin/bash
 				
 				source $HOME/.cargo/env && cd PR-$giteePullRequestIid
-				cargo  +nightly test
+				cargo test
 				'''
 			}
 		}
@@ -84,7 +84,7 @@ EOF
 				sh '''#!/bin/bash
 
 				source $HOME/.cargo/env && cd PR-$giteePullRequestIid
-				cargo  +nightly build
+				cargo build
 				'''
 			}
 		}       
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 72513a1..9e35769 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -5,7 +5,7 @@ WORKDIR /app
 COPY .. /app
 
 
-RUN cargo +nightly build --release --bin $BINARY --target x86_64-unknown-linux-musl
+RUN rustup target add x86_64-unknown-linux-musl && cargo build --release --bin $BINARY --target x86_64-unknown-linux-musl
 
 FROM openeuler/openeuler:22.03
 ARG USERNAME=signatrust
diff --git a/docker/Dockerfile.control-server b/docker/Dockerfile.control-server
index 64e5347..26e4e24 100644
--- a/docker/Dockerfile.control-server
+++ b/docker/Dockerfile.control-server
@@ -5,7 +5,7 @@ WORKDIR /app
 COPY .. /app
 
 
-RUN cargo +nightly build --release --bin $BINARY --target x86_64-unknown-linux-musl
+RUN rustup target add x86_64-unknown-linux-musl && cargo build --release --bin $BINARY --target x86_64-unknown-linux-musl
 
 #The sql-cli@0.7.1 binary is pre-build with dockerfile `Dockerfile.sqlx-cli`.
 FROM tommylike/sqlx-cli:0.7.1 as sqlx-cli
diff --git a/docker/Dockerfile.data-server b/docker/Dockerfile.data-server
index 92fe090..ed12c66 100644
--- a/docker/Dockerfile.data-server
+++ b/docker/Dockerfile.data-server
@@ -4,8 +4,7 @@ LABEL Author=TommyLike<tommylikehu@gmail.com>
 WORKDIR /app
 COPY .. /app
 
-
-RUN cargo +nightly build --release --bin $BINARY --target x86_64-unknown-linux-musl
+RUN rustup target add x86_64-unknown-linux-musl && cargo build --release --bin $BINARY --target x86_64-unknown-linux-musl
 
 FROM openeuler/openeuler:22.03
 ARG USERNAME=signatrust
-- 
Gitee