From fae4a113d64ef11553cf7db203f92522c9074c48 Mon Sep 17 00:00:00 2001 From: prplV Date: Tue, 5 Aug 2025 10:15:00 -0400 Subject: [PATCH] build setup --- .dockerignore | 2 ++ Cargo.toml | 0 Dockerfile | 22 ++---------------- Jenkinsfile | 0 README.md | 0 build.sh | 50 +++++++++++++++++++++++++++++++++++++++-- gdb_init | 0 logo.png | Bin noxis-rs/settings.json | 12 +++++----- rust-toolchain | 0 10 files changed, 58 insertions(+), 28 deletions(-) create mode 100644 .dockerignore mode change 100644 => 100755 Cargo.toml mode change 100644 => 100755 Dockerfile mode change 100644 => 100755 Jenkinsfile mode change 100644 => 100755 README.md mode change 100644 => 100755 gdb_init mode change 100644 => 100755 logo.png mode change 100644 => 100755 rust-toolchain diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..2c96eb1 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,2 @@ +target/ +Cargo.lock diff --git a/Cargo.toml b/Cargo.toml old mode 100644 new mode 100755 diff --git a/Dockerfile b/Dockerfile old mode 100644 new mode 100755 index b5128cd..0c4cae3 --- a/Dockerfile +++ b/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"] diff --git a/Jenkinsfile b/Jenkinsfile old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/build.sh b/build.sh index a397f1d..9ab5935 100755 --- a/build.sh +++ b/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 diff --git a/gdb_init b/gdb_init old mode 100644 new mode 100755 diff --git a/logo.png b/logo.png old mode 100644 new mode 100755 diff --git a/noxis-rs/settings.json b/noxis-rs/settings.json index 7c74d01..45b86cc 100644 --- a/noxis-rs/settings.json +++ b/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 @@ } } ] -} \ No newline at end of file +} diff --git a/rust-toolchain b/rust-toolchain old mode 100644 new mode 100755