From f4edb07629bf948794068d1941bde9e0d06c5dd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=B6=9B?= Date: Sun, 7 Apr 2024 22:26:39 +0800 Subject: [PATCH] =?UTF-8?q?feat(build):=E5=AE=8C=E6=88=90Docker=E9=95=9C?= =?UTF-8?q?=E5=83=8F=E7=9A=84=E7=BC=96=E8=AF=91=E9=85=8D=E7=BD=AE=E5=92=8C?= =?UTF-8?q?=E6=9E=84=E5=BB=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- license_server/Dockerfile => Dockerfile | 10 +++++----- license_server/crates.conf => crates.conf | 0 license_server/src/main.rs | 1 - license_server/sources.list => sources.list | 8 -------- 4 files changed, 5 insertions(+), 14 deletions(-) rename license_server/Dockerfile => Dockerfile (84%) rename license_server/crates.conf => crates.conf (100%) rename license_server/sources.list => sources.list (63%) diff --git a/license_server/Dockerfile b/Dockerfile similarity index 84% rename from license_server/Dockerfile rename to Dockerfile index 84b2935..a542a51 100644 --- a/license_server/Dockerfile +++ b/Dockerfile @@ -1,20 +1,20 @@ -FROM rust:1.69-slim-bullseye AS builder +FROM rust:1.77-bullseye AS builder ADD sources.list /etc/apt/ RUN apt-get update && apt-get install -y \ - rpcsvc-proto \ libc6-dev \ libclang-dev \ pkg-config \ libssl-dev ADD crates.conf /root/.cargo/config RUN USER=root cargo new --bin license_service +ADD ./cert_lib /cert_lib WORKDIR /license_service -COPY ./Cargo.toml ./Cargo.toml +COPY ./license_server/Cargo.toml ./Cargo.toml RUN cargo build --release && rm src/*.rs target/release/deps/license_server* -ADD ./src ./src +ADD ./license_server/src ./src RUN cargo build --release @@ -37,7 +37,7 @@ RUN groupadd service && \ COPY --from=builder /license_service/target/release/license_server /license_service/license_server -RUN chown -R $APP_USER:service license_server +RUN chown -R $APP_USER:service /license_service USER $APP_USER WORKDIR /license_service diff --git a/license_server/crates.conf b/crates.conf similarity index 100% rename from license_server/crates.conf rename to crates.conf diff --git a/license_server/src/main.rs b/license_server/src/main.rs index a524aa6..88f17b9 100644 --- a/license_server/src/main.rs +++ b/license_server/src/main.rs @@ -1,4 +1,3 @@ -#![feature(diagnostic_namespace)] #![allow(dead_code)] use tracing::{error, info}; diff --git a/license_server/sources.list b/sources.list similarity index 63% rename from license_server/sources.list rename to sources.list index ef13981..bcd89ff 100644 --- a/license_server/sources.list +++ b/sources.list @@ -12,12 +12,4 @@ deb-src http://mirrors.163.com/debian/ bullseye-backports main non-free contrib #deb http://mirrors.163.com/debian-security/ bullseye/updates main non-free contrib -#deb http://mirrors.ustc.edu.cn/debian-security/ bullseye/updates main non-free contrib - #deb-src http://mirrors.163.com/debian-security/ bullseye/updates main non-free contrib - -#deb-src http://mirrors.ustc.edu.cn/debian-security/ bullseye/updates main non-free contrib - -deb http://mirrors.ustc.edu.cn/debian-security/ stable-security main non-free contrib - -deb-src http://mirrors.ustc.edu.cn/debian-security/ stable-security main non-free contri \ No newline at end of file