build(Docker): 🐛 fix workspace bug and remove openssl static link

backend/Cargo.toml

@@ -39,6 +39,7 @@ opentelemetry-otlp = { version = "0.14.0", features = ["metrics"] }
 
 [dependencies.reqwest]
 version = "0.11.22"
+default-features = false
 features = ["rustls-tls", "json"]
 
 [dependencies.k256]
@@ -77,7 +78,7 @@ features = ["derive"]
 
 [dependencies.tonic]
 version = "0.10.2"
-features = ["transport", "channel", "codegen", "prost"]
+features = ["transport", "channel", "codegen", "prost","tls"]
 
 [dependencies.spin]
 version = "0.9.8"

backend/Dockerfile

@@ -4,21 +4,20 @@ ARG ARCH
 WORKDIR /complier
 
 RUN apt update -y
-RUN apt install musl-tools protobuf-compiler pkg-config libssl-dev -y
+RUN apt install musl-tools protobuf-compiler pkg-config make -y
 
 RUN cargo install just
 
 RUN rustup target add ${ARCH}-unknown-linux-musl
 
 WORKDIR /complier
 COPY . .
-RUN OPENSSL_STATIC=1 OPENSSL_DIR=/usr/include/openssl cargo install --target ${ARCH}-unknown-linux-musl --path backend
+RUN cargo install --target ${ARCH}-unknown-linux-musl --path backend
 
 FROM scratch
+# WORKDIR are used instead of mkdir
 WORKDIR /database
 WORKDIR /config
-WORKDIR /cert
-WORKDIR /backend
-COPY --from=builder /usr/local/cargo/bin/backend /backend
+COPY --from=builder /usr/local/cargo/bin/backend /
 
-CMD ["/backend/backend"]
+CMD ["/backend"]

backend/justfile

@@ -17,7 +17,6 @@ entity-codegen:
     rm entity/src/prelude.rs
 
 release-docker:
-    just prepare
     sudo docker build --build-arg ARCH=$(uname -m) -f ./Dockerfile -t mdoj-backend ..
 
 run:

judger/.dockerignore

@@ -1,5 +1,5 @@
 /.temp
 *.log
-/config.toml
 /nsjail-docker
-/config
+/config
+/Dockerfile

judger/.gitignore

@@ -5,5 +5,4 @@
 /config.toml
 /judger.proto
 /config
-/plugins-out
-/ws-Cargo.toml
+/plugins-out

judger/Dockerfile

@@ -4,7 +4,7 @@ ARG ARCH
 WORKDIR /complier
 
 RUN apt update -y
-RUN apt install musl-tools protobuf-compiler -y
+RUN apt install musl-tools protobuf-compiler pkg-config make -y
 
 RUN cargo install just
 
@@ -15,20 +15,18 @@ COPY . .
 
 RUN cargo install --target ${ARCH}-unknown-linux-musl --path judger
 
-WORKDIR /environment
-RUN mkdir -p .temp
-
 FROM scratch
 WORKDIR /database
 WORKDIR /config
 WORKDIR /.temp
-WORKDIR /plugins/rootfs
 WORKDIR /
 COPY --from=builder /usr/local/cargo/bin/judger /
-COPY nsjail-3.1 /
-# don't load plugins, should be mounted manually in runtime
-WORKDIR /
-COPY plugins/rlua-54/rootfs /plugins
-COPY plugins/rlua-54/spec.toml /plugins
 
+COPY judger/nsjail-3.1 /
+
+WORKDIR /plugins/rlua-54
+COPY judger/plugins/rlua-54/rootfs .
+COPY judger/plugins/rlua-54/spec.toml .
+
+WORKDIR /
 CMD ["/judger"]

judger/justfile

@@ -1,8 +1,5 @@
 release-docker:
-    MUSL_TARGET=$(uname -m)-linux-musl
     cd plugins/rlua-54 && sh ./build.sh
-    cp ../proto/judger.proto .
-    cp ../Cargo.toml ws-Cargo.toml
     sudo docker build --build-arg ARCH=$(uname -m) -f ./Dockerfile -t mdoj-judger ..
 
 build-plugin:
@@ -30,7 +27,7 @@ clean:
     sudo docker images rm nsjail-3.1-$(uname -m)-linux-musl
     sudo docker images rm protobuf-3.21.1-$(uname -m)-linux-musl
     sudo docker images rm libnl-3.2.25-$(uname -m)-linux-musl
-    sudo docker images rm  musl-cross-make-$(uname -m)-linux-musl
+    sudo docker images rm musl-cross-make-$(uname -m)-linux-musl
 
 test:
     sudo rm -rf .temp/*

judger/plugins/rlua-54/spec.toml

@@ -1,5 +1,5 @@
 # memory in byte, time in microsecond
-info = "A Lua 5.4 runtime build both real workloads and sandbox tests"
+info = "A lightweight Lua 5.4 runtime build for both secure sandboxing and modj-sandbox test"
 extension = "lua" # same extension means same language
 name = "rlua-54" # must be same as dictionary name
 uid = "1c41598f-e253-4f81-9ef5-d50bf1e4e74f" # be sure it's unique