diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index 40747b5..5d538ea 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -21,9 +21,10 @@ jobs:
- stable
steps:
- - uses: leafo/gh-actions-lua@v10
- with:
- luaVersion: 'luajit'
+ - name: Install LuaJIT and Lua
+ run: |
+ sudo apt-get update
+ sudo apt-get install -y --no-install-recommends liblua5.4-dev liblua5.3-dev liblua5.2-dev liblua5.1-0-dev libluajit-5.1-dev
- uses: actions/checkout@v3
- run: rustup toolchain install stable --profile minimal
- uses: Swatinem/rust-cache@v2
diff --git a/.github/workflows/rust_format.yml b/.github/workflows/rust_format.yml
index 7e23fbb..50debec 100644
--- a/.github/workflows/rust_format.yml
+++ b/.github/workflows/rust_format.yml
@@ -13,9 +13,10 @@ jobs:
name: Rust project
runs-on: ubuntu-latest
steps:
- - uses: leafo/gh-actions-lua@v10
- with:
- luaVersion: 'luajit'
+ - name: Install LuaJIT and Lua
+ run: |
+ sudo apt-get update
+ sudo apt-get install -y --no-install-recommends liblua5.4-dev liblua5.3-dev liblua5.2-dev liblua5.1-0-dev libluajit-5.1-dev
- uses: actions/checkout@v2
- name: Install minimal stable with clippy and rustfmt
uses: actions-rs/toolchain@v1
diff --git a/Cargo.lock b/Cargo.lock
index 0ceb626..14b1932 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1707,9 +1707,9 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
[[package]]
name = "memchr"
-version = "2.6.1"
+version = "2.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f478948fd84d9f8e86967bf432640e46adfb5a4bd4f14ef7e864ab38220534ae"
+checksum = "5486aed0026218e61b8a01d5fbd5a0a134649abb71a0e53b7bc088529dced86e"
[[package]]
name = "memoffset"
@@ -2015,19 +2015,20 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
[[package]]
name = "pest"
-version = "2.7.2"
+version = "2.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1acb4a4365a13f749a93f1a094a7805e5cfa0955373a9de860d962eaa3a5fe5a"
+checksum = "d7a4d085fd991ac8d5b05a147b437791b4260b76326baf0fc60cf7c9c27ecd33"
dependencies = [
+ "memchr",
"thiserror",
"ucd-trie",
]
[[package]]
name = "pest_derive"
-version = "2.7.2"
+version = "2.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "666d00490d4ac815001da55838c500eafb0320019bbaa44444137c48b443a853"
+checksum = "a2bee7be22ce7918f641a33f08e3f43388c7656772244e2bbb2477f44cc9021a"
dependencies = [
"pest",
"pest_generator",
@@ -2035,9 +2036,9 @@ dependencies = [
[[package]]
name = "pest_generator"
-version = "2.7.2"
+version = "2.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68ca01446f50dbda87c1786af8770d535423fa8a53aec03b8f4e3d7eb10e0929"
+checksum = "d1511785c5e98d79a05e8a6bc34b4ac2168a0e3e92161862030ad84daa223141"
dependencies = [
"pest",
"pest_meta",
@@ -2048,9 +2049,9 @@ dependencies = [
[[package]]
name = "pest_meta"
-version = "2.7.2"
+version = "2.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56af0a30af74d0445c0bf6d9d051c979b516a1a5af790d251daee76005420a48"
+checksum = "b42f0394d3123e33353ca5e1e89092e533d2cc490389f2bd6131c43c634ebc5f"
dependencies = [
"once_cell",
"pest",
@@ -3671,7 +3672,7 @@ dependencies = [
[[package]]
name = "websurfx"
-version = "0.18.5"
+version = "0.18.6"
dependencies = [
"actix-cors",
"actix-files",
@@ -3687,6 +3688,7 @@ dependencies = [
"log",
"md5",
"mlua",
+ "once_cell",
"rand 0.8.5",
"redis",
"regex",
diff --git a/Cargo.toml b/Cargo.toml
index 4826911..c8dcb55 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "websurfx"
-version = "0.18.5"
+version = "0.18.6"
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"
@@ -19,16 +19,17 @@ 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"]}
-redis = {version="0.23.2", features=["tokio-comp", "connection-manager"]}
+mlua = {version="0.8.10",features=["luajit"]}
+redis = {version="0.23.2",features=["tokio-comp","connection-manager"]}
md5 = {version="0.7.0"}
rand={version="0.8.5"}
+once_cell = {version="1.18.0"}
error-stack = {version="0.4.0"}
async-trait = {version="0.1.73"}
-regex = {version="1.9.3", features=["perf"]}
-smallvec = {version="1.11.0", features=["union", "serde"]}
-futures = {version="0.3.28"}
+regex = {version="1.9.4", features=["perf"]}
+futures = {version="0.3.28"}dhat = {version="0.3.2", optional = true}
dhat = {version="0.3.2", optional = true}
+smallvec = {version="1.11.0", features=["union", "serde"]}
[dev-dependencies]
rusty-hook = "^0.11.2"
diff --git a/Dockerfile b/Dockerfile
index 0c54453..2611aca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,7 @@ COPY . .
RUN cargo install --path .
# We do not need the Rust toolchain to run the binary!
-FROM gcr.io/distroless/cc-debian11
+FROM gcr.io/distroless/cc-debian12
COPY --from=builder /app/public/ /opt/websurfx/public/
COPY --from=builder /app/websurfx/config.lua /etc/xdg/websurfx/config.lua
COPY --from=builder /usr/local/cargo/bin/* /usr/local/bin/
diff --git a/README.md b/README.md
index 07d73f5..8287c1d 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
Readme |
Discord |
GitHub |
- Documentation
+ Documentation