merge back to master

.github/workflows/staging.yml

@@ -43,8 +43,6 @@ jobs:
         uses: taiki-e/install-action@just
       - name: Install sea-orm-cli
         run: cargo install sea-orm-cli
-      - name: Install docker
-        uses: docker-practice/actions-setup-docker@master
       - name: Lint
         run: |
           cargo fmt --all -- --check
@@ -60,7 +58,7 @@ jobs:
     steps:
       - name: Check out
         uses: actions/checkout@v3
-      - name: Checkout submodules
+      - name: Checkout submodule
         run: git submodule update --init --recursive
       - name: Install Rust
         uses: dtolnay/rust-toolchain@nightly
@@ -70,38 +68,42 @@ jobs:
           components: clippy, rustfmt
       - name: Install Just
         uses: taiki-e/install-action@just
-      - name: Install sea-orm-cli
-        run: cargo install sea-orm-cli
       - name: Install docker
         uses: docker-practice/actions-setup-docker@master
-      - name: build nsjail
-        run: cd judger && just build-nsjail
-      - name: build rlua-54
-        run: cd judger && just release-docker
       - name: Log in to the Container registry
-        uses: docker/login-action
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: build judger
-        uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
-        with:
-          context: "judger"
-          push: true
-          tags: "staging"
-          labels: "judger"
       - name: build backend
-        uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
+        uses: docker/build-push-action@v5
         with:
-          context: "backend"
+          build-args: ARCH=x86_64
+          context: "."
+          file: "backend/Dockerfile"
           push: true
           tags: "staging"
           labels: "backend"
       - name: build migration
-        uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
+        uses: docker/build-push-action@v5
+        with:
+          build-args: ARCH=x86_64
+          context: "."
+          file: "backend/migration/Dockerfile"
+          push: true
+          tags: "staging"
+          labels: "backend/migration"
+      - name: build nsjail
+        run: cd judger && just build-nsjail
+      - name: build rlua-54
+        run: cd judger && just release-docker
+      - name: build judger
+        uses: docker/build-push-action@v5
         with:
-          context: "backend/migration"
+          build-args: ARCH=x86_64
+          context: "."
+          file: "judger/Dockerfile"
           push: true
           tags: "staging"
-          labels: "backend/migration"
+          labels: "judger"

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "judger/nsjail-docker"]
 	path = judger/nsjail-docker
-	url = git@github.com:mdcpp/static-binary-zoo.git
+	url = https://github.com/mdcpp/static-binary-zoo.git

backend/justfile

@@ -18,6 +18,9 @@ entity-codegen:
     sea-orm-cli migrate -u sqlite://database/backend.sqlite?mode=rwc
     sea-orm-cli generate entity -u sqlite://database/backend.sqlite?mode=rwc -o src/pending
 
+# release-docker:
+#    sudo docker build --build-arg ARCH=$(uname -m) -f ./Dockerfile -t mdoj-backend ..
+
 run:
     cargo run
 

backend/migration/Dockerfile

@@ -12,7 +12,7 @@ RUN rustup target add ${ARCH}-unknown-linux-musl
 
 WORKDIR /complier
 COPY . .
-RUN cargo install --target ${ARCH}-unknown-linux-musl --path migration
+RUN cargo install --target ${ARCH}-unknown-linux-musl --path backend/migration
 
 FROM scratch
 COPY --from=builder /usr/local/cargo/bin/migration /

judger/justfile

@@ -11,7 +11,7 @@ release-plugin:
     cd plugins sh export-all.sh
 
 build-nsjail:
-    cd nsjail-docker && sudo make nsjail-3.1
+    cd nsjail-docker && sudo make nsjail-3.1 > /dev/null
     cp nsjail-docker/output/*-linux-musl/nsjail-* .
 
 prepare:

judger/plugins/c-11/build.sh

@@ -1,3 +1,3 @@
 mkdir -p rootfs
 sudo docker build -t c-11-mdoj-plugin .
-sudo docker export $(sudo docker create c-11-mdoj-plugin) | tar -C rootfs -xvf -
+sudo docker export $(sudo docker create c-11-mdoj-plugin) | tar -C rootfs -xvf - > /dev/null

judger/plugins/cpp-11/build.sh

@@ -1,3 +1,3 @@
 mkdir -p rootfs
 sudo docker build -t cpp-11-mdoj-plugin .
-sudo docker export $(sudo docker create cpp-11-mdoj-plugin) | tar -C rootfs -xvf -
+sudo docker export $(sudo docker create cpp-11-mdoj-plugin) | tar -C rootfs -xvf - > /dev/null

judger/plugins/rlua-54/build.sh

@@ -1,3 +1,3 @@
 mkdir -p rootfs
 sudo docker build --build-arg ARCH=$(uname -m) -t rlua-54-mdoj-plugin .
-sudo docker export $(sudo docker create rlua-54-mdoj-plugin) | tar -C rootfs -xvf -
+sudo docker export $(sudo docker create rlua-54-mdoj-plugin) | tar -C rootfs -xvf - > /dev/null