This commit is contained in:
kvan7 2024-01-22 03:24:31 +00:00
parent 4bceeb2a8f
commit 18fe273aa4
2 changed files with 77 additions and 39 deletions

View file

@ -1,4 +1,4 @@
FROM alpine:3.18 FROM debian:bullseye-slim
ENTRYPOINT ["/sbin/tini","--","/usr/local/searxng/dockerfiles/docker-entrypoint.sh"] ENTRYPOINT ["/sbin/tini","--","/usr/local/searxng/dockerfiles/docker-entrypoint.sh"]
EXPOSE 8080 EXPOSE 8080
VOLUME /etc/searxng VOLUME /etc/searxng
@ -6,8 +6,11 @@ VOLUME /etc/searxng
ARG SEARXNG_GID=977 ARG SEARXNG_GID=977
ARG SEARXNG_UID=977 ARG SEARXNG_UID=977
RUN addgroup -g ${SEARXNG_GID} searxng && \ # RUN addgroup -g ${SEARXNG_GID} searxng && \
adduser -u ${SEARXNG_UID} -D -h /usr/local/searxng -s /bin/sh -G searxng searxng # adduser -u ${SEARXNG_UID} -D -h /usr/local/searxng -s /bin/sh -G searxng searxng
RUN groupadd -g ${SEARXNG_GID} searxng && \
useradd -u ${SEARXNG_UID} -d /usr/local/searxng -s /bin/bash -g searxng searxng
ENV INSTANCE_NAME=searxng \ ENV INSTANCE_NAME=searxng \
AUTOCOMPLETE= \ AUTOCOMPLETE= \
@ -21,33 +24,61 @@ ENV INSTANCE_NAME=searxng \
WORKDIR /usr/local/searxng WORKDIR /usr/local/searxng
COPY requirements.txt ./requirements.txt # COPY requirements.txt ./requirements.txt
RUN apk add --no-cache -t build-dependencies \ # RUN apk add --no-cache -t build-dependencies \
build-base \ # build-base \
py3-setuptools \ # py3-setuptools \
# python3-dev \
# libffi-dev \
# libxslt-dev \
# libxml2-dev \
# openssl-dev \
# tar \
# git \
# && apk add --no-cache \
# ca-certificates \
# su-exec \
# python3 \
# py3-pip \
# libxml2 \
# libxslt \
# openssl \
# tini \
# uwsgi \
# uwsgi-python3 \
# brotli \
# && pip3 install --no-cache -r requirements.txt \
# && apk del build-dependencies \
# && rm -rf /root/.cache
# Install necessary packages
RUN apt-get update && apt-get install -y \
build-essential \
python3-setuptools \
python3-dev \ python3-dev \
libffi-dev \ libffi-dev \
libxslt-dev \ libxslt1-dev \
libxml2-dev \ libxml2-dev \
openssl-dev \ libssl-dev \
tar \ tar \
git \ git \
&& apk add --no-cache \
ca-certificates \ ca-certificates \
su-exec \ python3-pip \
python3 \
py3-pip \
libxml2 \ libxml2 \
libxslt \ libxslt1.1 \
openssl \ openssl \
tini \ tini \
uwsgi \ uwsgi \
uwsgi-python3 \ uwsgi-plugin-python3 \
brotli \ brotli \
&& pip3 install --no-cache -r requirements.txt \ && apt-get clean \
&& apk del build-dependencies \ && rm -rf /var/lib/apt/lists/*
&& rm -rf /root/.cache
# Install Python packages from requirements.txt
COPY requirements.txt ./requirements.txt
RUN pip3 install --no-cache -r requirements.txt
COPY --chown=searxng:searxng dockerfiles ./dockerfiles COPY --chown=searxng:searxng dockerfiles ./dockerfiles
COPY --chown=searxng:searxng searx ./searx COPY --chown=searxng:searxng searx ./searx
@ -56,10 +87,17 @@ ARG TIMESTAMP_SETTINGS=0
ARG TIMESTAMP_UWSGI=0 ARG TIMESTAMP_UWSGI=0
ARG VERSION_GITCOMMIT=unknown ARG VERSION_GITCOMMIT=unknown
# RUN su searxng -c "/usr/bin/python3 -m compileall -q searx" \
# && touch -c --date=@${TIMESTAMP_SETTINGS} searx/settings.yml \
# && touch -c --date=@${TIMESTAMP_UWSGI} dockerfiles/uwsgi.ini \
# && find /usr/local/searxng/searx/static -a \( -name '*.html' -o -name '*.css' -o -name '*.js' \
# -o -name '*.svg' -o -name '*.ttf' -o -name '*.eot' \) \
# -type f -exec gzip -9 -k {} \+ -exec brotli --best {} \+
RUN su searxng -c "/usr/bin/python3 -m compileall -q searx" \ RUN su searxng -c "/usr/bin/python3 -m compileall -q searx" \
&& touch -c --date=@${TIMESTAMP_SETTINGS} searx/settings.yml \ && touch -c --date=@${TIMESTAMP_SETTINGS} searx/settings.yml \
&& touch -c --date=@${TIMESTAMP_UWSGI} dockerfiles/uwsgi.ini \ && touch -c --date=@${TIMESTAMP_UWSGI} dockerfiles/uwsgi.ini \
&& find /usr/local/searxng/searx/static -a \( -name '*.html' -o -name '*.css' -o -name '*.js' \ && find /usr/local/searxng/searx/static \( -name '*.html' -o -name '*.css' -o -name '*.js' \
-o -name '*.svg' -o -name '*.ttf' -o -name '*.eot' \) \ -o -name '*.svg' -o -name '*.ttf' -o -name '*.eot' \) \
-type f -exec gzip -9 -k {} \+ -exec brotli --best {} \+ -type f -exec gzip -9 -k {} \+ -exec brotli --best {} \+
@ -71,20 +109,20 @@ ARG SEARXNG_DOCKER_TAG=unknown
ARG LABEL_VCS_REF= ARG LABEL_VCS_REF=
ARG LABEL_VCS_URL= ARG LABEL_VCS_URL=
LABEL maintainer="searxng <${GIT_URL}>" \ LABEL maintainer="searxng <${GIT_URL}>" \
description="A privacy-respecting, hackable metasearch engine." \ description="A privacy-respecting, hackable metasearch engine." \
version="${SEARXNG_GIT_VERSION}" \ version="${SEARXNG_GIT_VERSION}" \
org.label-schema.schema-version="1.0" \ org.label-schema.schema-version="1.0" \
org.label-schema.name="searxng" \ org.label-schema.name="searxng" \
org.label-schema.version="${SEARXNG_GIT_VERSION}" \ org.label-schema.version="${SEARXNG_GIT_VERSION}" \
org.label-schema.url="${LABEL_VCS_URL}" \ org.label-schema.url="${LABEL_VCS_URL}" \
org.label-schema.vcs-ref=${LABEL_VCS_REF} \ org.label-schema.vcs-ref=${LABEL_VCS_REF} \
org.label-schema.vcs-url=${LABEL_VCS_URL} \ org.label-schema.vcs-url=${LABEL_VCS_URL} \
org.label-schema.build-date="${LABEL_DATE}" \ org.label-schema.build-date="${LABEL_DATE}" \
org.label-schema.usage="https://github.com/searxng/searxng-docker" \ org.label-schema.usage="https://github.com/searxng/searxng-docker" \
org.opencontainers.image.title="searxng" \ org.opencontainers.image.title="searxng" \
org.opencontainers.image.version="${SEARXNG_DOCKER_TAG}" \ org.opencontainers.image.version="${SEARXNG_DOCKER_TAG}" \
org.opencontainers.image.url="${LABEL_VCS_URL}" \ org.opencontainers.image.url="${LABEL_VCS_URL}" \
org.opencontainers.image.revision=${LABEL_VCS_REF} \ org.opencontainers.image.revision=${LABEL_VCS_REF} \
org.opencontainers.image.source=${LABEL_VCS_URL} \ org.opencontainers.image.source=${LABEL_VCS_URL} \
org.opencontainers.image.created="${LABEL_DATE}" \ org.opencontainers.image.created="${LABEL_DATE}" \
org.opencontainers.image.documentation="https://github.com/searxng/searxng-docker" org.opencontainers.image.documentation="https://github.com/searxng/searxng-docker"

2
manage
View file

@ -201,7 +201,7 @@ docker.build() {
build_msg DOCKER "Last commit : $VERSION_GITCOMMIT" build_msg DOCKER "Last commit : $VERSION_GITCOMMIT"
# define the docker image name # define the docker image name
GITHUB_USER=$(echo "${GIT_URL}" | sed 's/.*github\.com\/\([^\/]*\).*/\1/') GITHUB_USER=$(echo "kvan7" | sed 's/.*github\.com\/\([^\/]*\).*/\1/')
SEARXNG_IMAGE_NAME="${SEARXNG_IMAGE_NAME:-${GITHUB_USER:-searxng}/searxng}" SEARXNG_IMAGE_NAME="${SEARXNG_IMAGE_NAME:-${GITHUB_USER:-searxng}/searxng}"
BUILD="build" BUILD="build"