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

Commit 6af14f3a authored by Arnau Vàzquez's avatar Arnau Vàzquez
Browse files

Merge branch 'fix-hardcode-paths' into 'master' 

Remove hardcoded links

Closes e/infra/backlog#635

See merge request e/cloud/my-spot!109
parents 6c075ffe 1c67be28

.env

+2 −1
Original line number Diff line number Diff line
@@ -12,3 +12,4 @@ SEARX_PROXY_HTTPS=socks5h://tor-socks-proxy:9150 
FILTRON_PORT=8088

MORTY_PORT=8089

NODE_NAME=local

CI_REGISTRY_IMAGE=registry.gitlab.e.foundation/e/infra/spot
 
 No newline at end of file

.env.prod

+2 −1
Original line number Diff line number Diff line
@@ -14,3 +14,4 @@ FILTRON_PORT=8088 
MORTY_PORT=8089

INTERNAL_NETWORK_NAME=default

NODE_NAME=spot11

CI_REGISTRY_IMAGE=registry-image
 
 No newline at end of file

.gitlab-ci.yml

+9 −1
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ build:web: 
  before_script:

    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY

  script:

    - docker pull $CI_REGISTRY_IMAGE/env 

    - docker tag $CI_REGISTRY_IMAGE/env base-env-image

    - docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG .

    - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG

    - docker build -t $CI_REGISTRY_IMAGE/nginx:$CI_COMMIT_REF_SLUG -f nginx.Dockerfile .
@@ -43,6 +45,8 @@ build:docker: 
build:docker:tags:

  extends: .build:docker

  script:

    - docker pull $CI_REGISTRY_IMAGE/env 

    - docker tag $CI_REGISTRY_IMAGE/env base-env-image

    - docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG .

    - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG

    - docker build -t $CI_REGISTRY_IMAGE/nginx:$CI_COMMIT_REF_SLUG -f nginx.Dockerfile .
@@ -68,7 +72,7 @@ test:unit: 
    - chmod 644 ~/.ssh/known_hosts ~/.ssh/id_ed25519.pub

    - ssh $DOCKER_HOST "cd $PATH_STAGING"

    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY

    - docker pull registry.gitlab.e.foundation:5000/e/cloud/my-spot/env

    - docker pull $CI_REGISTRY_IMAGE/env



deploy:spot.eeo.one.backend1:

  extends: .deploy:template
@@ -110,6 +114,7 @@ deploy:spot.eeo.one.backend1: 
      && sed -i 's/MORTY_PORT=8089/MORTY_PORT=$MORTY_PORT/g' .env

      && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env

      && sed -i 's/NODE_NAME=spot11/NODE_NAME=$NODE_NAME/g' .env

      && sed -i 's/CI_REGISTRY_IMAGE=registry-image/CI_REGISTRY_IMAGE=$CI_REGISTRY_IMAGE/g' .env

      && docker-compose pull && docker-compose stop filtron && sleep 2 && docker-compose up -d"



deploy:spot.eeo.one.backend2:
@@ -152,6 +157,7 @@ deploy:spot.eeo.one.backend2: 
      && sed -i 's/MORTY_PORT=8089/MORTY_PORT=$MORTY_PORT/g' .env

      && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env

      && sed -i 's/NODE_NAME=spot11/NODE_NAME=$NODE_NAME/g' .env

      && sed -i 's/CI_REGISTRY_IMAGE=registry-image/CI_REGISTRY_IMAGE=$CI_REGISTRY_IMAGE/g' .env

      && docker-compose pull && docker-compose stop filtron && sleep 5 && docker-compose up -d"



deploy:spot.ecloud.global.backend1:
@@ -193,6 +199,7 @@ deploy:spot.ecloud.global.backend1: 
      && sed -i 's/MORTY_PORT=8089/MORTY_PORT=$MORTY_PORT/g' .env

      && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env

      && sed -i 's/NODE_NAME=spot11/NODE_NAME=$NODE_NAME/g' .env

      && sed -i 's/CI_REGISTRY_IMAGE=registry-image/CI_REGISTRY_IMAGE=$CI_REGISTRY_IMAGE/g' .env

      && docker-compose pull && docker-compose stop filtron && sleep 2 && docker-compose up -d"



deploy:spot.ecloud.global.backend2:
@@ -234,5 +241,6 @@ deploy:spot.ecloud.global.backend2: 
      && sed -i 's/MORTY_PORT=8089/MORTY_PORT=$MORTY_PORT/g' .env

      && sed -i 's/INTERNAL_NETWORK_NAME=default/INTERNAL_NETWORK_NAME=$INTERNAL_NETWORK_NAME/g' .env

      && sed -i 's/NODE_NAME=spot11/NODE_NAME=$NODE_NAME/g' .env

      && sed -i 's/CI_REGISTRY_IMAGE=registry-image/CI_REGISTRY_IMAGE=$CI_REGISTRY_IMAGE/g' .env

      && docker-compose pull && docker-compose stop filtron && sleep 2 && docker-compose up -d"

Dockerfile

+3 −2
Original line number Diff line number Diff line 
FROM registry.gitlab.e.foundation:5000/e/cloud/my-spot/env as builder

FROM base-env-image as builder

# base-env-image -> ${CI_REGISTRY_IMAGE}/env



COPY . /src/

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



FROM python:3.9-slim

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

LABEL maintainer="dev@e.email"

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



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

README.md

+1 −1
Original line number Diff line number Diff line
@@ -61,6 +61,6 @@ You can only run spot, with a python command inside a docker container which 
contains all dependencies.



```

docker run -it --rm -v $(pwd):/ws -w /ws -e SEARX_UI_DEFAULT_THEME=etheme -p 8088:80 registry.gitlab.e.foundation:5000/e/cloud/my-spot/env bash

docker run -it --rm -v $(pwd):/ws -w /ws -e SEARX_UI_DEFAULT_THEME=etheme -p 8088:80 registry.gitlab.e.foundation/e/infra/spot/env bash

PYTHONPATH=$(pwd) SEARX_DEBUG=1 python -X dev searx/webapp.py

```