From 25b49de65c1b953c506b5ddd319754fca54f4a1c Mon Sep 17 00:00:00 2001 From: mjanez <96422458+mjanez@users.noreply.github.com> Date: Mon, 17 Apr 2023 07:49:40 +0000 Subject: [PATCH 1/2] Add logging to docker compose files --- docker-compose.dev.yml | 20 ++++++++++++++++++++ docker-compose.nginx.yml | 25 +++++++++++++++++++++++++ docker-compose.yml | 36 +++++++++++++++++++++++++++++++++--- 3 files changed, 78 insertions(+), 3 deletions(-) diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index ba37362..e0b462e 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -16,6 +16,11 @@ services: - TZ=${TZ} env_file: - .env + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" depends_on: db: condition: service_healthy @@ -43,6 +48,11 @@ services: - DATASTORE_READONLY_PASSWORD=${DATASTORE_READONLY_PASSWORD} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - PGDATA=/var/lib/postgresql/data/db + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" volumes: - pg_data:/var/lib/postgresql/data restart: unless-stopped @@ -52,6 +62,11 @@ services: solr: container_name: ${SOLR_CONTAINER_NAME} image: ckan/ckan-solr:${SOLR_IMAGE_VERSION} + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" volumes: - solr_data:/var/solr restart: unless-stopped @@ -61,6 +76,11 @@ services: redis: container_name: ${REDIS_CONTAINER_NAME} image: redis:${REDIS_VERSION} + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" restart: unless-stopped healthcheck: test: ["CMD", "redis-cli", "-e", "QUIT"] \ No newline at end of file diff --git a/docker-compose.nginx.yml b/docker-compose.nginx.yml index 4f1738c..8fd2bac 100644 --- a/docker-compose.nginx.yml +++ b/docker-compose.nginx.yml @@ -15,6 +15,11 @@ services: dockerfile: Dockerfile env_file: - .env + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" depends_on: ckan: condition: service_healthy @@ -30,6 +35,11 @@ services: image: ghcr.io/mjanez/ckan-spatial:master env_file: - .env + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" depends_on: db: condition: service_healthy @@ -56,6 +66,11 @@ services: - DATASTORE_READONLY_PASSWORD=${DATASTORE_READONLY_PASSWORD} - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} - PGDATA=/var/lib/postgresql/data/db + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" volumes: - pg_data:/var/lib/postgresql/data restart: unless-stopped @@ -70,6 +85,11 @@ services: image: ckan/ckan-solr:${SOLR_IMAGE_VERSION} env_file: - .env + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" volumes: - solr_data:/var/solr restart: unless-stopped @@ -79,6 +99,11 @@ services: redis: container_name: ${REDIS_CONTAINER_NAME} image: redis:${REDIS_VERSION} + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" restart: unless-stopped healthcheck: test: ["CMD", "redis-cli", "-e", "QUIT"] diff --git a/docker-compose.yml b/docker-compose.yml index 3781169..f02cbc3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,6 +14,11 @@ services: dockerfile: Dockerfile env_file: - .env + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" depends_on: ckan: condition: service_healthy @@ -23,12 +28,17 @@ services: ckan: container_name: ${CKAN_CONTAINER_NAME} - build: - context: ckan/ - dockerfile: Dockerfile + # build: + # context: ckan/ + # dockerfile: Dockerfile image: ghcr.io/mjanez/ckan-spatial:master env_file: - .env + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" depends_on: db: condition: service_healthy @@ -51,6 +61,11 @@ services: dockerfile: Dockerfile env_file: - .env + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" depends_on: ckan: condition: service_healthy @@ -76,6 +91,11 @@ services: - PGDATA=/var/lib/postgresql/data/db volumes: - pg_data:/var/lib/postgresql/data + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" restart: unless-stopped healthcheck: test: ["CMD", "pg_isready", "-U", "ckan"] @@ -88,6 +108,11 @@ services: image: ckan/ckan-solr:${SOLR_IMAGE_VERSION} env_file: - .env + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" volumes: - solr_data:/var/solr restart: unless-stopped @@ -97,6 +122,11 @@ services: redis: container_name: ${REDIS_CONTAINER_NAME} image: redis:${REDIS_VERSION} + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" restart: unless-stopped healthcheck: test: ["CMD", "redis-cli", "-e", "QUIT"] From 9d47feca615bfb5aef8be2a18885720ea9754a09 Mon Sep 17 00:00:00 2001 From: mjanez <96422458+mjanez@users.noreply.github.com> Date: Mon, 17 Apr 2023 07:50:16 +0000 Subject: [PATCH 2/2] Fix APACHE_PROXY_PASS to APACHE_CKAN_PROXY_PASS --- .env | 2 +- apache/Dockerfile | 2 +- apache/setup/httpd.conf | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.env b/.env index ed57dda..c203aff 100644 --- a/.env +++ b/.env @@ -34,7 +34,7 @@ NGINX_PORT=80 NGINX_SSLPORT=443 # Apache HTTP Server -APACHE_VERSION=2.4 +APACHE_VERSION=2.4-alpine APACHE_PORT=80 APACHE_LOG_DIR=/var/log/apache APACHE_SERVER_NAME=localhost diff --git a/apache/Dockerfile b/apache/Dockerfile index 721cd5a..a1d962a 100644 --- a/apache/Dockerfile +++ b/apache/Dockerfile @@ -13,7 +13,7 @@ ENV APACHE_SERVER_NAME=localhost ENV APACHE_CKAN_LOCATION=/ ENV APACHE_PYCSW_LOCATION=/csw ENV APACHE_PYCSW_PROXY_PASS=http://${PYCSW_CONTAINER_NAME}:${PYCSW_PORT_HOST} -ENV APACHE_PROXY_PASS=http://${CKAN_CONTAINER_NAME}:${CKAN_PORT_HOST} +ENV APACHE_CKAN_PROXY_PASS=http://${CKAN_CONTAINER_NAME}:${CKAN_PORT_HOST} RUN mkdir -p ${APACHE_LOG_DIR} diff --git a/apache/setup/httpd.conf b/apache/setup/httpd.conf index 1c527f5..b5cdc66 100644 --- a/apache/setup/httpd.conf +++ b/apache/setup/httpd.conf @@ -225,8 +225,8 @@ Group www-data # - ProxyPass ${APACHE_PROXY_PASS} - ProxyPassReverse ${APACHE_PROXY_PASS} + ProxyPass ${APACHE_CKAN_PROXY_PASS} + ProxyPassReverse ${APACHE_CKAN_PROXY_PASS}