From 0540440f96cb5a5d04bc4294b440f959f3dbc691 Mon Sep 17 00:00:00 2001 From: nivesh Date: Fri, 19 Nov 2021 13:13:05 +0530 Subject: [PATCH 1/4] mount logging to host --- Dockerfile | 2 +- docker-compose.yml | 6 ++++-- etc/nginx/conf.d/spot.conf | 3 +++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 23ce4b0c0..1da20f523 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,4 +15,4 @@ COPY --from=builder /install/ /usr/local/ EXPOSE 80 STOPSIGNAL SIGINT -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", "--access-logfile", "/var/log/gunicorn/access.log", "--error-logfile", "/var/log/gunicorn/access.log", "--pythonpath", "/usr/local/lib/python3.9/site-packages", "searx.webapp:app"] diff --git a/docker-compose.yml b/docker-compose.yml index c583de8a2..c984e24e9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,7 +19,6 @@ services: build: context: . dockerfile: Dockerfile - logging: *default-logging restart: unless-stopped environment: SEARX_SECRET: "${SEARX_SECRET}" @@ -31,16 +30,19 @@ services: SEARX_UI_DEFAULT_THEME: "${SEARX_UI_DEFAULT_THEME}" GUNICORN_LOGGER: 1 GUNICORN_LEVEL: INFO + volumes: + - /var/log/containers/spot:/var/log/gunicorn spot-nginx: image: registry.gitlab.e.foundation:5000/e/cloud/my-spot/nginx:${SPOT_NGINX_DOCKER_TAG} build: context: . dockerfile: nginx.Dockerfile - logging: *default-logging restart: unless-stopped environment: SEARX_MORTY_URL: "${SEARX_MORTY_URL}" + volumes: + - /var/log/containers/nginx:/var/log/nginx filtron: image: dalf/filtron:latest diff --git a/etc/nginx/conf.d/spot.conf b/etc/nginx/conf.d/spot.conf index a95b5aa6b..d6c7f73a0 100644 --- a/etc/nginx/conf.d/spot.conf +++ b/etc/nginx/conf.d/spot.conf @@ -18,6 +18,9 @@ server { add_header Content-Security-Policy "default-src 'none'; script-src 'self'; style-src 'self' 'unsafe-inline'; form-action 'self'; font-src 'self'; frame-ancestors 'self'; base-uri 'self'; connect-src 'self' https://overpass-api.de; img-src 'self' __SEARX_MORTY_URL__ data: https://*.tile.openstreetmap.org; frame-src https://www.youtube-nocookie.com https://player.vimeo.com https://www.dailymotion.com https://www.deezer.com https://www.mixcloud.com https://w.soundcloud.com https://embed.spotify.com"; add_header X-Frame-Options "SAMEORIGIN"; + access_log /var/log/nginx/access.log; + error_log /var/log/nginx/error.log; + root /var/www/spot; location = / { -- GitLab From 43fc6da609eb94d6f9f096abf098af7b47b628ca Mon Sep 17 00:00:00 2001 From: nivesh Date: Tue, 23 Nov 2021 10:36:06 +0530 Subject: [PATCH 2/4] add logging to docker-compose prod --- docker-compose.prod.yml | 6 ++++-- docker-compose.yml | 6 ++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 45ffd4eb8..02a21089a 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -22,7 +22,6 @@ services: build: context: . dockerfile: Dockerfile - logging: *default-logging restart: always networks: - ${INTERNAL_NETWORK_NAME} @@ -36,6 +35,8 @@ services: SEARX_UI_DEFAULT_THEME: "${SEARX_UI_DEFAULT_THEME}" GUNICORN_LOGGER: 1 GUNICORN_LEVEL: INFO + volumes: + - /var/log/containers/spot/app:/var/log/gunicorn spot-nginx: image: registry.gitlab.e.foundation:5000/e/cloud/my-spot/nginx:${SPOT_NGINX_DOCKER_TAG} @@ -43,12 +44,13 @@ services: build: context: . dockerfile: nginx.Dockerfile - logging: *default-logging restart: always networks: - ${INTERNAL_NETWORK_NAME} environment: SEARX_MORTY_URL: "${SEARX_MORTY_URL}" + volumes: + - /var/log/containers/spot/nginx:/var/log/gunicorn filtron: image: dalf/filtron:latest diff --git a/docker-compose.yml b/docker-compose.yml index c984e24e9..c583de8a2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,6 +19,7 @@ services: build: context: . dockerfile: Dockerfile + logging: *default-logging restart: unless-stopped environment: SEARX_SECRET: "${SEARX_SECRET}" @@ -30,19 +31,16 @@ services: SEARX_UI_DEFAULT_THEME: "${SEARX_UI_DEFAULT_THEME}" GUNICORN_LOGGER: 1 GUNICORN_LEVEL: INFO - volumes: - - /var/log/containers/spot:/var/log/gunicorn spot-nginx: image: registry.gitlab.e.foundation:5000/e/cloud/my-spot/nginx:${SPOT_NGINX_DOCKER_TAG} build: context: . dockerfile: nginx.Dockerfile + logging: *default-logging restart: unless-stopped environment: SEARX_MORTY_URL: "${SEARX_MORTY_URL}" - volumes: - - /var/log/containers/nginx:/var/log/nginx filtron: image: dalf/filtron:latest -- GitLab From ed26448903a6aac18a3e1e34c7fb0b64ca825cb8 Mon Sep 17 00:00:00 2001 From: nivesh Date: Tue, 23 Nov 2021 10:43:11 +0530 Subject: [PATCH 3/4] add env variable for log directory --- .env.prod | 3 ++- .gitlab-ci.yml | 2 ++ docker-compose.prod.yml | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.env.prod b/.env.prod index 8c3d0d53d..048a0053c 100644 --- a/.env.prod +++ b/.env.prod @@ -12,4 +12,5 @@ SEARX_PROXY_HTTPS=http://proxy01.ecloud.global:1099 WIREGUARD_IP=127.0.0.1 FILTRON_PORT=8088 MORTY_PORT=8089 -INTERNAL_NETWORK_NAME=default \ No newline at end of file +INTERNAL_NETWORK_NAME=default +LOG_DIRECTORY=staging-spot \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7b5fe3a8a..3bad0c595 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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" diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 02a21089a..a1e96546d 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -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 -- GitLab From 6a7fbfff53450f53e0e3b6e8e36b92a63d8516d5 Mon Sep 17 00:00:00 2001 From: nivesh Date: Tue, 23 Nov 2021 11:43:47 +0530 Subject: [PATCH 4/4] fix log dir for nginx --- docker-compose.prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index a1e96546d..3c20b32e1 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -50,7 +50,7 @@ services: environment: SEARX_MORTY_URL: "${SEARX_MORTY_URL}" volumes: - - /var/log/containers/${LOG_DIRECTORY}/nginx:/var/log/gunicorn + - /var/log/containers/${LOG_DIRECTORY}/nginx:/var/log/nginx filtron: image: dalf/filtron:latest -- GitLab