build setup

.dockerignore

@@ -0,0 +1,2 @@
+target/
+Cargo.lock

Dockerfile

@@ -1,31 +1,13 @@
-FROM ubuntu:22.04
+FROM registry.entcor/trust-module/rust:1.88.0-extended
 
 USER root
 
-RUN apt update && apt install -y \
-    curl \
-    build-essential \
-    libssl-dev \
-    pkg-config \
-    libudev-dev \
-    procps \
-    gcc-riscv64-unknown-elf \
-    gcc-riscv64-linux-gnu \
-    binutils-riscv64-linux-gnu \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-
-ENV PATH="/root/.cargo/bin:${PATH}"
-
 WORKDIR /usr/src/kii/
 
 COPY . ./
 
 RUN chmod +x noxis-rs/temp-process
-
-RUN rustup target add riscv64gc-unknown-linux-gnu && rustup target add x86_64-unknown-linux-gnu
-
+RUN rustup target add riscv64gc-unknown-linux-gnu
 RUN cargo unibuild
 
 ENTRYPOINT ["cargo", "test"]

build.sh

@@ -5,7 +5,7 @@
 # Поддерживаемые архитектуры: amd64, riscv64
 
 if [ -z "$1" ]; then
-  echo "Ошибка: Необходимо указать архитектуру (например, amd64 или riscv64)."
+  echo "Ошибка: Необходимо указать архитектуру (например, amd64)."
   exit 1
 fi
 
@@ -13,7 +13,7 @@ ARCH="$1"
 TARGET_DIR="release/${ARCH}"
 CONTAINER_NAME="e-monitor"
 
-SUPPORTED_ARCHS=("amd64" "riscv64")
+SUPPORTED_ARCHS=("amd64" "riscv64" "supported")
 if [[ ! " ${SUPPORTED_ARCHS[@]} " =~ " ${ARCH} " ]]; then
   echo "Ошибка: Неизвестная архитектура $ARCH. Допустимые значения: ${SUPPORTED_ARCHS[*]}."
   exit 1
@@ -52,6 +52,11 @@ case "$ARCH" in
       docker stop "$CONTAINER_NAME" && docker rm "$CONTAINER_NAME"
       exit 1
     }
+    docker cp "$CONTAINER_NAME:/usr/src/kii/target/x86_64-unknown-linux-gnu/release/noxis-proxy" "$TARGET_DIR/" || {
+      echo "Ошибка: Не удалось скопировать noxis-proxy для amd64."
+      docker stop "$CONTAINER_NAME" && docker rm "$CONTAINER_NAME"
+      exit 1
+    }
     ;;
   riscv64)
     echo "Copying binaries for architecture: riscv64"
@@ -65,6 +70,47 @@ case "$ARCH" in
       docker stop "$CONTAINER_NAME" && docker rm "$CONTAINER_NAME"
       exit 1
     }
+    docker cp "$CONTAINER_NAME:/usr/src/kii/target/riscv64gc-unknown-linux-gnu/release/noxis-proxy" "$TARGET_DIR/" || {
+      echo "Ошибка: Не удалось скопировать noxis-proxy для riscv64."
+      docker stop "$CONTAINER_NAME" && docker rm "$CONTAINER_NAME"
+      exit 1
+    }
+    ;;
+  supported)
+    TARGET_DIR="release/supported/amd64"
+    echo "Copying binaries for architecture: amd64"
+    docker cp "$CONTAINER_NAME:/usr/src/kii/target/x86_64-unknown-linux-gnu/release/noxis-cli" "$TARGET_DIR/amd64/" || {
+      echo "Ошибка: Не удалось скопировать noxis-cli для amd64."
+      docker stop "$CONTAINER_NAME" && docker rm "$CONTAINER_NAME"
+      exit 1
+    }
+    docker cp "$CONTAINER_NAME:/usr/src/kii/target/x86_64-unknown-linux-gnu/release/noxis-rs" "$TARGET_DIR/amd64/" || {
+      echo "Ошибка: Не удалось скопировать noxis-rs для amd64."
+      docker stop "$CONTAINER_NAME" && docker rm "$CONTAINER_NAME"
+      exit 1
+    }
+    docker cp "$CONTAINER_NAME:/usr/src/kii/target/x86_64-unknown-linux-gnu/release/noxis-proxy" "$TARGET_DIR/amd64/" || {
+      echo "Ошибка: Не удалось скопировать noxis-proxy для amd64."
+      docker stop "$CONTAINER_NAME" && docker rm "$CONTAINER_NAME"
+      exit 1
+    }
+    TARGET_DIR="release/supported/riscv64"
+    echo "Copying binaries for architecture: riscv64"
+    docker cp "$CONTAINER_NAME:/usr/src/kii/target/riscv64gc-unknown-linux-gnu/release/noxis-cli" "$TARGET_DIR/riscv64/" || {
+      echo "Ошибка: Не удалось скопировать noxis-cli для riscv64."
+      docker stop "$CONTAINER_NAME" && docker rm "$CONTAINER_NAME"
+      exit 1
+    }
+    docker cp "$CONTAINER_NAME:/usr/src/kii/target/riscv64gc-unknown-linux-gnu/release/noxis-rs" "$TARGET_DIR/riscv64/" || {
+      echo "Ошибка: Не удалось скопировать noxis-rs для riscv64."
+      docker stop "$CONTAINER_NAME" && docker rm "$CONTAINER_NAME"
+      exit 1
+    }
+    docker cp "$CONTAINER_NAME:/usr/src/kii/target/riscv64gc-unknown-linux-gnu/release/noxis-proxy" "$TARGET_DIR/riscv64/" || {
+      echo "Ошибка: Не удалось скопировать noxis-proxy для riscv64."
+      docker stop "$CONTAINER_NAME" && docker rm "$CONTAINER_NAME"
+      exit 1
+    }
     ;;
 esac
 

noxis-rs/settings.json

@@ -1,5 +1,5 @@
 {
-  "dateOfCreation": "1721381809112",
+  "dateOfCreation": "1721381809122",
   "processes": [
     {
       "name": "temp-process",
@@ -12,7 +12,7 @@
             "triggers": {
               "onDelete": "stop",
               "onChange": "restart",
-              "doRestore" : true
+              "doRestore": true
             }
           },
           {
@@ -21,7 +21,7 @@
             "triggers": {
               "onDelete": "stop",
               "onChange": "restart",
-              "doRestore" : false
+              "doRestore": false
             }
           },
           {
@@ -30,7 +30,7 @@
             "triggers": {
               "onDelete": "stop",
               "onChange": "restart",
-              "doRestore" : false
+              "doRestore": false
             }
           },
           {
@@ -39,7 +39,7 @@
             "triggers": {
               "onDelete": "stop",
               "onChange": "restart",
-              "doRestore" : true
+              "doRestore": true
             }
           }
         ],
@@ -64,4 +64,4 @@
       }
     }
   ]
-}
+}