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

Commit ed264489 authored by Nivesh Krishna's avatar Nivesh Krishna
Browse files

add env variable for log directory

parent 43fc6da6

.env.prod

+2 −1
Original line number Diff line number Diff line
@@ -13,3 +13,4 @@ WIREGUARD_IP=127.0.0.1 
FILTRON_PORT=8088

MORTY_PORT=8089

INTERNAL_NETWORK_NAME=default

LOG_DIRECTORY=staging-spot
 
 No newline at end of file

.gitlab-ci.yml

+2 −0
Original line number Diff line number Diff line
@@ -187,6 +187,7 @@ deploy:spot.ecloud.global.backend1: 
      && sed -i 's/FILTRON_PORT=8088/FILTRON_PORT=$FILTRON_PORT/g' .env

      && 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/LOG_DIRECTORY=staging-spot/LOG_DIRECTORY=production-spot/g' .env

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



deploy:spot.ecloud.global.backend2:
@@ -226,5 +227,6 @@ deploy:spot.ecloud.global.backend2: 
      && sed -i 's/FILTRON_PORT=8088/FILTRON_PORT=$FILTRON_PORT/g' .env

      && 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/LOG_DIRECTORY=staging-spot/LOG_DIRECTORY=production-spot/g' .env

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

docker-compose.prod.yml

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ services: 
      GUNICORN_LOGGER: 1

      GUNICORN_LEVEL: INFO

    volumes: 

      - /var/log/containers/spot/app:/var/log/gunicorn

      - /var/log/containers/${LOG_DIRECTORY}/app:/var/log/gunicorn



  spot-nginx:

    image: registry.gitlab.e.foundation:5000/e/cloud/my-spot/nginx:${SPOT_NGINX_DOCKER_TAG}
@@ -50,7 +50,7 @@ services: 
    environment:

      SEARX_MORTY_URL: "${SEARX_MORTY_URL}"

    volumes: 

      - /var/log/containers/spot/nginx:/var/log/gunicorn

      - /var/log/containers/${LOG_DIRECTORY}/nginx:/var/log/gunicorn



  filtron:

    image: dalf/filtron:latest