From 76b024c8cbe991280cb3c4d733cf46e5c0f699d8 Mon Sep 17 00:00:00 2001
From: ouyangkang <ouyangkang@tezign.com>
Date: Wed, 13 Mar 2024 17:12:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20dockerfile=2021?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile        | 88 ++++++++++++++++++++++----------------------
 Dockerfile.gitlab | 94 +++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 134 insertions(+), 48 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cb21b09..918e199 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,40 +4,40 @@ WORKDIR /usr/src/
 
 COPY . .
 
-# RUN sed -i "s@http://deb.debian.org@https://mirrors.tuna.tsinghua.edu.cn@g" /etc/apt/sources.list
-# RUN cat /etc/apt/sources.list
-# RUN rm -Rf /var/lib/apt/lists/*
-# RUN apt-get update
+# # RUN sed -i "s@http://deb.debian.org@https://mirrors.tuna.tsinghua.edu.cn@g" /etc/apt/sources.list
+# # RUN cat /etc/apt/sources.list
+# # RUN rm -Rf /var/lib/apt/lists/*
+# # RUN apt-get update
 
 
-RUN echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ buster main" > /etc/apt/sources.list \
-    && echo "deb-src https://mirrors.tuna.tsinghua.edu.cn/debian/ buster main" >> /etc/apt/sources.list \
-    && apt-get update \
-    && apt-get clean
+# RUN echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ buster main" > /etc/apt/sources.list \
+#     && echo "deb-src https://mirrors.tuna.tsinghua.edu.cn/debian/ buster main" >> /etc/apt/sources.list \
+#     && apt-get update \
+#     && apt-get clean
 
-# COPY dockerfileconfig/sources.list /etc/apt/sources.list
+# # COPY dockerfileconfig/sources.list /etc/apt/sources.list
 
-# RUN cat /etc/apt/sources.list
-# RUN rm -Rf /var/lib/apt/lists/*
-# RUN apt-get update
+# # RUN cat /etc/apt/sources.list
+# # RUN rm -Rf /var/lib/apt/lists/*
+# # RUN apt-get update
 
-RUN apt-get install -y libssl-dev pkg-config
+# RUN apt-get install -y libssl-dev pkg-config
 
-COPY dockerfileconfig/config /root/.cargo/config 
+# COPY dockerfileconfig/config /root/.cargo/config 
 
 RUN cargo build --release
 
-FROM debian:bookworm-slim
+FROM debian:buster-slim
 
 
-RUN sed -i "s@http://deb.debian.org@https://mirrors.tuna.tsinghua.edu.cn@g" /etc/apt/sources.list
-# COPY --from=builder /usr/src/dockerfileconfig/sources.list /etc/apt/sources.list
-RUN cat /etc/apt/sources.list
-RUN rm -Rf /var/lib/apt/lists/*
-RUN apt-get update
-# RUN sed -i "s@http://deb.debian.org@http://mirrors.aliyun.com@g" /etc/apt/sources.list && rm -Rf /var/lib/apt/lists/* && apt-get update
+# RUN sed -i "s@http://deb.debian.org@https://mirrors.tuna.tsinghua.edu.cn@g" /etc/apt/sources.list
+# # COPY --from=builder /usr/src/dockerfileconfig/sources.list /etc/apt/sources.list
+# RUN cat /etc/apt/sources.list
+# RUN rm -Rf /var/lib/apt/lists/*
+# RUN apt-get update
+# # RUN sed -i "s@http://deb.debian.org@http://mirrors.aliyun.com@g" /etc/apt/sources.list && rm -Rf /var/lib/apt/lists/* && apt-get update
 
-RUN apt-get install -y libc6 
+# RUN apt-get install -y libc6 
 
 WORKDIR /usr/app
 
@@ -51,39 +51,39 @@ EXPOSE 8080
 CMD ["sh", "-c", "./credits-cli task $task_params && ./credits-cli start"]
 
 
-# # ENV start_params=" "
+# # # ENV start_params=" "
 
 
-# # FROM dockerhub.tezign.com/innovation/muse-credits/muse-credits:v1.6
+# # # FROM dockerhub.tezign.com/innovation/muse-credits/muse-credits:v1.6
 
-# # ENV start_params=" "
+# # # ENV start_params=" "
 
-# # EXPOSE 8080
-# # CMD ["sh", "-c", "/usr/app/credits-cli task ${task_params} && /usr/app/credits-cli start"]
+# # # EXPOSE 8080
+# # # CMD ["sh", "-c", "/usr/app/credits-cli task ${task_params} && /usr/app/credits-cli start"]
 
-# FROM dockerhub.tezign.com/tekton/cuda:11.7.0-cudnn8-runtime-ubuntu22.04
-# # RUN sed -i "s@archive.ubuntu.com@mirrors.tuna.tsinghua.edu.cn@g" /etc/apt/sources.list && \
-# #     sed -i "s@security.ubuntu.com@mirrors.tuna.tsinghua.edu.cn@g" /etc/apt/sources.list
+# # FROM dockerhub.tezign.com/tekton/cuda:11.7.0-cudnn8-runtime-ubuntu22.04
+# # # RUN sed -i "s@archive.ubuntu.com@mirrors.tuna.tsinghua.edu.cn@g" /etc/apt/sources.list && \
+# # #     sed -i "s@security.ubuntu.com@mirrors.tuna.tsinghua.edu.cn@g" /etc/apt/sources.list
 
-# RUN apt-get update && \
-#     apt-get install -y curl build-essential libssl-dev pkg-config
+# # RUN apt-get update && \
+# #     apt-get install -y curl build-essential libssl-dev pkg-config
 
-# RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+# # RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 
-# ENV PATH="/root/.cargo/bin:${PATH}"
+# # ENV PATH="/root/.cargo/bin:${PATH}"
 
-# WORKDIR /usr/app/
+# # WORKDIR /usr/app/
 
-# COPY . .
+# # COPY . .
 
-# RUN echo '[source.crates-io]' > ~/.cargo/config \
-#     && echo "replace-with = 'ustc'"  >> ~/.cargo/config \
-#     && echo '[source.ustc]' >> ~/.cargo/config \
-#     && echo 'registry = "git://mirrors.ustc.edu.cn/crates.io-index"'  >> ~/.cargo/config 
+# # RUN echo '[source.crates-io]' > ~/.cargo/config \
+# #     && echo "replace-with = 'ustc'"  >> ~/.cargo/config \
+# #     && echo '[source.ustc]' >> ~/.cargo/config \
+# #     && echo 'registry = "git://mirrors.ustc.edu.cn/crates.io-index"'  >> ~/.cargo/config 
 
-# RUN cargo build --release
+# # RUN cargo build --release
 
-# ENV start_params " "
+# # ENV start_params " "
 
-# EXPOSE 8080
-# CMD ["sh", "-c", "./credits-cli task $task_params && ./credits-cli start"]
+# # EXPOSE 8080
+# # CMD ["sh", "-c", "./credits-cli task $task_params && ./credits-cli start"]
diff --git a/Dockerfile.gitlab b/Dockerfile.gitlab
index b78982a..1bae3c4 100644
--- a/Dockerfile.gitlab
+++ b/Dockerfile.gitlab
@@ -1,18 +1,104 @@
+# FROM rust:1.74-slim as builder
+
+# WORKDIR /usr/src/
+
+# COPY . .
+
+# RUN apt-get update && apt-get install -y libssl-dev pkg-config
+
+# RUN cargo build --release
+
+# FROM debian:bookworm-slim
+
+# RUN apt-get update && apt-get install -y libc6 
+
+# WORKDIR /usr/app
+
+# COPY --from=builder /usr/src/config /usr/app/config
+# COPY --from=builder /usr/src/target/release/credits-cli /usr/app/credits-cli
+
+
 FROM rust:1.74-slim as builder
 
 WORKDIR /usr/src/
 
 COPY . .
 
-RUN apt-get update && apt-get install -y libssl-dev pkg-config
+# # RUN sed -i "s@http://deb.debian.org@https://mirrors.tuna.tsinghua.edu.cn@g" /etc/apt/sources.list
+# # RUN cat /etc/apt/sources.list
+# # RUN rm -Rf /var/lib/apt/lists/*
+# # RUN apt-get update
+
+
+# RUN echo "deb https://mirrors.tuna.tsinghua.edu.cn/debian/ buster main" > /etc/apt/sources.list \
+#     && echo "deb-src https://mirrors.tuna.tsinghua.edu.cn/debian/ buster main" >> /etc/apt/sources.list \
+#     && apt-get update \
+#     && apt-get clean
+
+# # COPY dockerfileconfig/sources.list /etc/apt/sources.list
+
+# # RUN cat /etc/apt/sources.list
+# # RUN rm -Rf /var/lib/apt/lists/*
+# # RUN apt-get update
+
+# RUN apt-get install -y libssl-dev pkg-config
+
+# COPY dockerfileconfig/config /root/.cargo/config 
 
 RUN cargo build --release
 
-FROM debian:bookworm-slim
+FROM debian:buster-slim
+
+
+# RUN sed -i "s@http://deb.debian.org@https://mirrors.tuna.tsinghua.edu.cn@g" /etc/apt/sources.list
+# # COPY --from=builder /usr/src/dockerfileconfig/sources.list /etc/apt/sources.list
+# RUN cat /etc/apt/sources.list
+# RUN rm -Rf /var/lib/apt/lists/*
+# RUN apt-get update
+# # RUN sed -i "s@http://deb.debian.org@http://mirrors.aliyun.com@g" /etc/apt/sources.list && rm -Rf /var/lib/apt/lists/* && apt-get update
 
-RUN apt-get update && apt-get install -y libc6 
+# RUN apt-get install -y libc6 
 
 WORKDIR /usr/app
 
 COPY --from=builder /usr/src/config /usr/app/config
-COPY --from=builder /usr/src/target/release/credits-cli /usr/app/credits-cli
\ No newline at end of file
+COPY --from=builder /usr/src/target/release/credits-cli /usr/app/credits-cli
+
+
+
+# # # ENV start_params=" "
+
+
+# # # FROM dockerhub.tezign.com/innovation/muse-credits/muse-credits:v1.6
+
+# # # ENV start_params=" "
+
+# # # EXPOSE 8080
+# # # CMD ["sh", "-c", "/usr/app/credits-cli task ${task_params} && /usr/app/credits-cli start"]
+
+# # FROM dockerhub.tezign.com/tekton/cuda:11.7.0-cudnn8-runtime-ubuntu22.04
+# # # RUN sed -i "s@archive.ubuntu.com@mirrors.tuna.tsinghua.edu.cn@g" /etc/apt/sources.list && \
+# # #     sed -i "s@security.ubuntu.com@mirrors.tuna.tsinghua.edu.cn@g" /etc/apt/sources.list
+
+# # RUN apt-get update && \
+# #     apt-get install -y curl build-essential libssl-dev pkg-config
+
+# # RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+
+# # ENV PATH="/root/.cargo/bin:${PATH}"
+
+# # WORKDIR /usr/app/
+
+# # COPY . .
+
+# # RUN echo '[source.crates-io]' > ~/.cargo/config \
+# #     && echo "replace-with = 'ustc'"  >> ~/.cargo/config \
+# #     && echo '[source.ustc]' >> ~/.cargo/config \
+# #     && echo 'registry = "git://mirrors.ustc.edu.cn/crates.io-index"'  >> ~/.cargo/config 
+
+# # RUN cargo build --release
+
+# # ENV start_params " "
+
+# # EXPOSE 8080
+# # CMD ["sh", "-c", "./credits-cli task $task_params && ./credits-cli start"]