From cfe87a25299fa56e757d36c190e5e558f08c8abc Mon Sep 17 00:00:00 2001 From: Mariusz Kogen Date: Mon, 22 Jul 2024 20:31:52 +0200 Subject: [PATCH] Update with upstream code - version bump - better install target in Makefile --- Dockerfile | 2 +- Makefile | 9 ++++----- manifest.yaml | 12 +++++------- scripts/services/migrations.ts | 2 +- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4634896..d741978 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM redis:alpine as redis -FROM searxng/searxng:2024.6.20-f195d98bf +FROM searxng/searxng:2024.7.20-657dcb973 USER root diff --git a/Makefile b/Makefile index 5eb7c8c..d3a9937 100644 --- a/Makefile +++ b/Makefile @@ -12,11 +12,10 @@ verify: $(PKG_ID).s9pk @echo " Filesize: $(shell du -h $(PKG_ID).s9pk) is ready" install: -ifeq (,$(wildcard ~/.embassy/config.yaml)) - @echo; echo "You must define \"host: http://server-name.local\" in ~/.embassy/config.yaml config file first"; echo -else - start-cli package install $(PKG_ID).s9pk -endif + @if [ ! -f ~/.embassy/config.yaml ]; then echo "You must define \"host: http://server-name.local\" in ~/.embassy/config.yaml config file first."; exit 1; fi + @echo "\nInstalling to $$(grep -v '^#' ~/.embassy/config.yaml | cut -d'/' -f3) ...\n" + @[ -f $(PKG_ID).s9pk ] || ( $(MAKE) && echo "\nInstalling to $$(grep -v '^#' ~/.embassy/config.yaml | cut -d'/' -f3) ...\n" ) + @start-cli package install $(PKG_ID).s9pk arm: @rm -f docker-images/x86_64.tar diff --git a/manifest.yaml b/manifest.yaml index f5b4e52..cfa8b9f 100644 --- a/manifest.yaml +++ b/manifest.yaml @@ -1,16 +1,14 @@ id: searxng title: "SearXNG" -version: 2024.6.20 +version: 2024.7.20 release-notes: | - Updated SearXNG code to the latest version from upstream. > `Highlights` - - Implemented dedicated module for Mojeek. - - Added engines for discourse forums (python, caddy, pi-hole). - - Added reusable function to filter text. - - Fixed issue of showing DDG IP from zero click. - - Implemented FindThatMeme engine. - - Added instant answers from DuckDuckGo. + - Image updated to use Alpine 3.20 and Python 3.12. + - Support for Alpine Linux packages searches `!alp` + - Fixed URL display issues in Firefox simple theme. + - Flag icon repositioned in language selection. license: MIT wrapper-repo: "https://github.com/Start9Labs/searxng-startos" upstream-repo: "https://github.com/searxng/searxng-docker" diff --git a/scripts/services/migrations.ts b/scripts/services/migrations.ts index b9a7cab..2af217e 100644 --- a/scripts/services/migrations.ts +++ b/scripts/services/migrations.ts @@ -24,5 +24,5 @@ export const migration: T.ExpectedExports.migration = ), }, }, - "2024.6.20" + "2024.7.20" );