From b01ea2b98e9fb3cd5b55f4f41a00464bca6c0eb7 Mon Sep 17 00:00:00 2001 From: overweight Date: Tue, 28 Sep 2021 10:15:06 +0800 Subject: [PATCH 1/3] do not ignore Cargo.lock --- .gitignore | 1 - Cargo.lock | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 Cargo.lock diff --git a/.gitignore b/.gitignore index c8e9e486..3df278ec 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ target -Cargo.lock .vscode diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 index 00000000..b171072c --- /dev/null +++ b/Cargo.lock @@ -0,0 +1,51 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "cc" +version = "1.0.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d26a6ce4b6a484fa3edb70f7efa6fc430fd2b87285fe8b84304fd0936faa0dc0" + +[[package]] +name = "init" +version = "0.1.0" +dependencies = [ + "libc", + "signal-hook", + "signal-hook-registry", + "utils", +] + +[[package]] +name = "libc" +version = "0.2.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd8f7255a17a627354f321ef0055d63b898c6fb27eff628af4d1b66b7331edf6" + +[[package]] +name = "signal-hook" +version = "0.3.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c98891d737e271a2954825ef19e46bd16bdb98e2746f2eec4f7a4ef7946efd1" +dependencies = [ + "cc", + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +dependencies = [ + "libc", +] + +[[package]] +name = "tests" +version = "0.1.0" + +[[package]] +name = "utils" +version = "0.1.0" -- Gitee From 96754629d6e2073c884ead9b8affe1b7f3fd6ef5 Mon Sep 17 00:00:00 2001 From: overweight Date: Tue, 28 Sep 2021 10:21:35 +0800 Subject: [PATCH 2/3] add support init args when exec docker run --- docker-run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-run.sh b/docker-run.sh index 35ef3e18..39b12599 100755 --- a/docker-run.sh +++ b/docker-run.sh @@ -52,4 +52,4 @@ docker build --no-cache --tag process1 `pwd` || exit 1 #!.docker run echo -e "\n\n\n---!!!RUN PROCESS1 IN DOCKER!!!---" -docker run process1 || exit 1 +docker run process1 init $* || exit 1 -- Gitee From f24b0f7f617b14237896b4c9e73df3f51228091f Mon Sep 17 00:00:00 2001 From: overweight Date: Tue, 28 Sep 2021 17:06:10 +0800 Subject: [PATCH 3/3] add simple systemd and process1 for test --- Cargo.toml | 2 ++ Dockerfile | 2 ++ src/init/Cargo.toml | 2 +- src/process1/Cargo.toml | 9 +++++++++ src/process1/src/main.rs | 3 +++ src/systemd/Cargo.toml | 9 +++++++++ src/systemd/src/main.rs | 3 +++ src/utils/Cargo.toml | 2 +- 8 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 src/process1/Cargo.toml create mode 100644 src/process1/src/main.rs create mode 100644 src/systemd/Cargo.toml create mode 100644 src/systemd/src/main.rs diff --git a/Cargo.toml b/Cargo.toml index b7ae88b3..3b6e4f1c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,7 @@ [workspace] members = [ "src/init", + "src/process1", + "src/systemd", "tests", ] diff --git a/Dockerfile b/Dockerfile index d1d0fe50..d7b6717c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,4 +2,6 @@ FROM scratch #ADD target/x86_64-unknown-linux-musl/debug/process1 /sbin/init COPY target/x86_64-unknown-linux-musl/debug/init /sbin/init +COPY target/x86_64-unknown-linux-musl/debug/process1 /sbin/process1 +COPY target/x86_64-unknown-linux-musl/debug/systemd /sbin/systemd CMD ["/sbin/init"] diff --git a/src/init/Cargo.toml b/src/init/Cargo.toml index c628da1a..de3c95ec 100644 --- a/src/init/Cargo.toml +++ b/src/init/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "init" version = "0.1.0" -authors = ["h00277865 "] +authors = ["overweight "] edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/src/process1/Cargo.toml b/src/process1/Cargo.toml new file mode 100644 index 00000000..b69c2006 --- /dev/null +++ b/src/process1/Cargo.toml @@ -0,0 +1,9 @@ +[package] +name = "process1" +version = "0.1.0" +authors = ["overweight "] +edition = "2018" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] diff --git a/src/process1/src/main.rs b/src/process1/src/main.rs new file mode 100644 index 00000000..e7a11a96 --- /dev/null +++ b/src/process1/src/main.rs @@ -0,0 +1,3 @@ +fn main() { + println!("Hello, world!"); +} diff --git a/src/systemd/Cargo.toml b/src/systemd/Cargo.toml new file mode 100644 index 00000000..bbe179af --- /dev/null +++ b/src/systemd/Cargo.toml @@ -0,0 +1,9 @@ +[package] +name = "systemd" +version = "0.1.0" +authors = ["overweight "] +edition = "2018" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] diff --git a/src/systemd/src/main.rs b/src/systemd/src/main.rs new file mode 100644 index 00000000..e7a11a96 --- /dev/null +++ b/src/systemd/src/main.rs @@ -0,0 +1,3 @@ +fn main() { + println!("Hello, world!"); +} diff --git a/src/utils/Cargo.toml b/src/utils/Cargo.toml index ff2cec42..52b5a46f 100644 --- a/src/utils/Cargo.toml +++ b/src/utils/Cargo.toml @@ -7,6 +7,6 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [lib] -crate-type = ["dylib", "rlib"] +#crate-type = ["dylib", "rlib"] [dependencies] -- Gitee