Skip to content

Commit

Permalink
Switch to manticore
Browse files Browse the repository at this point in the history
  • Loading branch information
tintou committed Jan 4, 2024
1 parent 1ab0e06 commit dcb3791
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 12 deletions.
16 changes: 10 additions & 6 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,15 @@ jobs:
run: |
export DEBIAN_FRONTEND=noninteractive
curl -fsSL https://deb.nodesource.com/setup_18.x | sudo -E bash -
sudo apt-get update -y
sudo apt-get install -y --no-install-recommends software-properties-common
sudo apt-get update -qq
sudo apt-get install -qq --no-install-recommends software-properties-common
sudo add-apt-repository -y ppa:vala-team/daily
sudo apt-get update -y
sudo apt-get update -qq
curl -O https://repo.manticoresearch.com/manticore-repo.noarch.deb
sudo dpkg -i manticore-repo.noarch.deb
sudo apt-get update -qq
sudo apt-get install \
-y \
-qq \
--no-install-recommends \
gcc \
libgee-0.8-dev \
Expand All @@ -34,14 +37,15 @@ jobs:
libvaladoc-0.58-dev \
php \
php-curl \
sphinxsearch \
unzip \
valac \
valadoc \
wget \
xsltproc \
make \
nodejs
nodejs \
manticore \
manticore-extra
- name: Build the documentation
run: |
Expand Down
11 changes: 9 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,22 @@
## Builds valadoc and serves it with a basic PHP server

# Cleanup and publish
FROM php:apache-buster
FROM php:apache-bullseye

ENV DEBIAN_FRONTEND=noninteractive

# Install sphinxsearch for search index
RUN apt-get update -qq && apt-get install \
-qq \
--no-install-recommends \
sphinxsearch
wget
RUN wget https://repo.manticoresearch.com/manticore-repo.noarch.deb
RUN dpkg -i manticore-repo.noarch.deb
RUN apt-get update -qq && apt-get install \
-qq \
--no-install-recommends \
manticore manticore-extra
RUN mkdir -p /var/run/manticore

# Install the mysqli extension
RUN docker-php-ext-install mysqli && docker-php-ext-enable mysqli
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,19 +72,19 @@ to install the devhelp books in your system. Now launch Devhelp and use them!
Searching
=========

For a more complete experience, you will need to install `sphinxsearch` and `xsltproc`.
For a more complete experience, you will need to install [manticore](https://manticoresearch.com/install/) and `xsltproc`.

On elementary OS or Ubuntu run:
```bash
sudo apt install sphinxsearch xsltproc
sudo apt install xsltproc
```

The run the following command to generate search indexes:
```bash
make serve-search
```

This will (eventually!) start a sphinx daemon on port `51413`.
This will (eventually!) start a manticore daemon on port `51413`.


Add New Packages
Expand Down
2 changes: 1 addition & 1 deletion docker-server.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash

cd /opt/valadoc && searchd
cd /opt/valadoc && searchd -c /opt/valadoc/sphinx.conf
apache2-foreground

0 comments on commit dcb3791

Please sign in to comment.