From 82cc061d07fd2a863eb920b6e07318b38e50ee2f Mon Sep 17 00:00:00 2001 From: boris Date: Wed, 20 Sep 2023 22:00:17 +0800 Subject: [PATCH 1/3] Provide a fix for Docker deployment process --- Cargo.lock | 42 ++++++++++++++++++++++++++++++++++++++++++ Cargo.toml | 2 +- Dockerfile | 2 +- 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 69d96d4..d387be1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1402,6 +1402,15 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +[[package]] +name = "home" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +dependencies = [ + "windows-sys", +] + [[package]] name = "html5ever" version = "0.23.0" @@ -1773,6 +1782,25 @@ version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +[[package]] +name = "lua-src" +version = "546.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c26d4af78361e025a3d03a2b964cd1592aff7495f4d4f7947218c084c6fdca8" +dependencies = [ + "cc", +] + +[[package]] +name = "luajit-src" +version = "210.4.8+resty107baaf" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05167e8b2a2185758d83ed23541e5bd8bce37072e4204e0ef2c9b322bc87c4e" +dependencies = [ + "cc", + "which", +] + [[package]] name = "mac" version = "0.1.1" @@ -1971,6 +1999,8 @@ checksum = "0bb37b0ba91f017aa7ca2b98ef99496827770cd635b4a932a6047c5b4bbe678e" dependencies = [ "bstr", "cc", + "lua-src", + "luajit-src", "num-traits", "once_cell", "pkg-config", @@ -3939,6 +3969,18 @@ dependencies = [ "tokio 1.32.0", ] +[[package]] +name = "which" +version = "4.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" +dependencies = [ + "either", + "home", + "once_cell", + "rustix", +] + [[package]] name = "winapi" version = "0.2.8" diff --git a/Cargo.toml b/Cargo.toml index ca92e2f..aa5bcac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,7 +19,7 @@ serde_json = {version="1.0.105"} fake-useragent = {version="0.1.3"} env_logger = {version="0.10.0"} log = {version="0.4.20"} -mlua = {version="0.8.10", features=["luajit"]} +mlua = {version="0.8.10", features=["luajit", "vendored"]} redis = {version="0.23.3", features=["tokio-comp","connection-manager"], optional = true} md5 = {version="0.7.0"} rand={version="0.8.5"} diff --git a/Dockerfile b/Dockerfile index e9339e5..f779730 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM rust:latest AS chef # We only pay the installation cost once, # it will be cached from the second build onwards -RUN cargo install cargo-chef +RUN cargo install cargo-chef --locked WORKDIR /app From b8ebc8256f09eea47a934674d0995561c70a1bcc Mon Sep 17 00:00:00 2001 From: alamin655 Date: Wed, 20 Sep 2023 19:38:50 +0530 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=9A=80=20chore:=20bump=20the=20app=20?= =?UTF-8?q?version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index aa5bcac..1cc51e5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "websurfx" -version = "0.21.3" +version = "0.21.4" edition = "2021" description = "An open-source alternative to Searx that provides clean, ad-free, and organic results with incredible speed while keeping privacy and security in mind." repository = "https://github.com/neon-mmd/websurfx" From c3f6e3c66d1dfe9755e76a6acf3b74475c8b3e32 Mon Sep 17 00:00:00 2001 From: alamin655 Date: Wed, 20 Sep 2023 19:39:44 +0530 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=9A=80=20chore:=20bump=20the=20app=20?= =?UTF-8?q?version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index d387be1..56d795f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3935,7 +3935,7 @@ dependencies = [ [[package]] name = "websurfx" -version = "0.21.3" +version = "0.21.4" dependencies = [ "actix-cors", "actix-files",