Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8e1f3d77 authored by Nicolas Gelot's avatar Nicolas Gelot
Browse files

update docker base image to 3.9-slim

parent b1f76640

.gitlab-ci.yml

+0 −2
Original line number Original line Diff line number Diff line
@@ -71,8 +71,6 @@ test:unit: 
.deploy:template:

.deploy:template:

  stage: deploy

  stage: deploy

  before_script:

  before_script:

    - pip install docker-compose

    - apk add openssh-client docker

    - eval $(ssh-agent -s)

    - eval $(ssh-agent -s)

    - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null

    - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null

    - mkdir -p ~/.ssh

    - mkdir -p ~/.ssh

Dockerfile

+4 −4
Original line number Original line Diff line number Diff line
@@ -4,16 +4,16 @@ COPY . /src/ 
RUN pip install --force-reinstall --prefix /install /src

RUN pip install --force-reinstall --prefix /install /src









FROM python:3.8-alpine

FROM python:3.9-slim

LABEL maintainer="spot <https://gitlab.e.foundation/e/cloud/my-spot/>"

LABEL maintainer="spot <https://gitlab.e.foundation/e/cloud/my-spot/>"

LABEL description="A privacy-respecting, hackable metasearch engine."

LABEL description="A privacy-respecting, hackable metasearch engine."





RUN apk add ca-certificates libxslt py3-gunicorn

RUN apt-get update -y && apt-get install -y libxslt1.1

RUN pip install gunicorn==20.0.4





COPY --from=builder /install/ /usr/local/

COPY --from=builder /install/ /usr/local/





EXPOSE 80

EXPOSE 80

STOPSIGNAL SIGINT

STOPSIGNAL SIGINT





ENV PYTHONPATH="/usr/local/lib/python3.8/site-packages"

CMD ["gunicorn", "-w", "1", "-b", "0.0.0.0:80", "--pythonpath", "/usr/local/lib/python3.9/site-packages", "searx.webapp:app"]
 
CMD ["gunicorn", "-w", "1", "-b", "0.0.0.0:80", "searx.webapp:app"]

env.Dockerfile

+9 −4
Original line number Original line Diff line number Diff line 
FROM python:3.8-alpine

FROM python:3.9-slim





COPY requirements.txt requirements-dev.txt /

COPY requirements.txt requirements-dev.txt /





RUN apk add build-base git libxml2-dev libxslt-dev libffi-dev openssl-dev npm \

RUN apt-get update -y && apt-get install -y build-essential git libxml2-dev libz-dev libxslt1-dev libffi-dev libssl-dev npm

&& pip install -r /requirements.txt \

RUN apt-get install -y apt-transport-https ca-certificates curl gnupg-agent software-properties-common \

&& curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add - \

&& add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -cs) stable" \

&& apt-get update \

&& apt-get install -y docker-ce docker-ce-cli containerd.io

RUN pip install -r /requirements.txt \

&& pip install -r /requirements-dev.txt \

&& pip install -r /requirements-dev.txt \

&& pip install virtualenv \

&& pip install virtualenv docker-compose \

&& rm -f /requirements.txt /requirements-dev.txt
 
&& rm -f /requirements.txt /requirements-dev.txt