From 6632d070f5a255a2fc9633b4e917401d1b12bd5f Mon Sep 17 00:00:00 2001 From: Alexander Minkin Date: Tue, 3 Oct 2023 01:49:39 +0300 Subject: [PATCH] fix(containers): :loud_sound: Set log output to stdout Let the docker handle logs. https://12factor.net/logs motivated me to do this --- install/automated/common/10-openvk.conf | 3 +-- install/automated/docker/acl_handler.sh | 1 - install/automated/docker/docker-compose.yml | 2 -- install/automated/docker/openvk.Dockerfile | 1 - install/automated/kubernetes/manifests/003-deployment.yaml | 5 ----- 5 files changed, 1 insertion(+), 11 deletions(-) diff --git a/install/automated/common/10-openvk.conf b/install/automated/common/10-openvk.conf index d842eefd..b272f5ac 100644 --- a/install/automated/common/10-openvk.conf +++ b/install/automated/common/10-openvk.conf @@ -8,6 +8,5 @@ Require all granted - ErrorLog /var/log/openvk/error.log - CustomLog /var/log/openvk/access.log combinedio + LogFormat combinedio diff --git a/install/automated/docker/acl_handler.sh b/install/automated/docker/acl_handler.sh index 8ef23239..e23176a3 100755 --- a/install/automated/docker/acl_handler.sh +++ b/install/automated/docker/acl_handler.sh @@ -8,7 +8,6 @@ do chown -R 33:33 /opt/chandler/extensions/available/openvk/tmp/api-storage/audios chown -R 33:33 /opt/chandler/extensions/available/openvk/tmp/api-storage/photos chown -R 33:33 /opt/chandler/extensions/available/openvk/tmp/api-storage/videos - chown -R 33:33 /var/log/openvk sleep 600 done \ No newline at end of file diff --git a/install/automated/docker/docker-compose.yml b/install/automated/docker/docker-compose.yml index 61ee3bac..685ab713 100644 --- a/install/automated/docker/docker-compose.yml +++ b/install/automated/docker/docker-compose.yml @@ -12,7 +12,6 @@ services: - openvk-audios:/opt/chandler/extensions/available/openvk/tmp/api-storage/audios - openvk-photos:/opt/chandler/extensions/available/openvk/tmp/api-storage/photos - openvk-videos:/opt/chandler/extensions/available/openvk/tmp/api-storage/videos - - openvk-logs:/var/log/openvk - ./openvk.yml:/opt/chandler/extensions/available/openvk/openvk.yml:ro - ./chandler.yml:/opt/chandler/chandler.yml:ro depends_on: @@ -32,7 +31,6 @@ services: - openvk-audios:/opt/chandler/extensions/available/openvk/tmp/api-storage/audios - openvk-photos:/opt/chandler/extensions/available/openvk/tmp/api-storage/photos - openvk-videos:/opt/chandler/extensions/available/openvk/tmp/api-storage/videos - - openvk-logs:/var/log/openvk - ./acl_handler.sh:/bin/acl_handler.sh:ro mariadb-primary: diff --git a/install/automated/docker/openvk.Dockerfile b/install/automated/docker/openvk.Dockerfile index 47f63b77..389f7443 100644 --- a/install/automated/docker/openvk.Dockerfile +++ b/install/automated/docker/openvk.Dockerfile @@ -48,7 +48,6 @@ RUN ln -s /opt/chandler/extensions/available/commitcaptcha/ /opt/chandler/extens ln -s /opt/chandler/extensions/available/openvk/install/automated/common/10-openvk.conf /etc/apache2/sites-enabled/10-openvk.conf && \ a2enmod rewrite -VOLUME [ "/var/log/openvk" ] VOLUME [ "/opt/chandler/extensions/available/openvk/storage" ] VOLUME [ "/opt/chandler/extensions/available/openvk/tmp/api-storage/audios" ] VOLUME [ "/opt/chandler/extensions/available/openvk/tmp/api-storage/photos" ] diff --git a/install/automated/kubernetes/manifests/003-deployment.yaml b/install/automated/kubernetes/manifests/003-deployment.yaml index e15d3ccd..edbc40f9 100644 --- a/install/automated/kubernetes/manifests/003-deployment.yaml +++ b/install/automated/kubernetes/manifests/003-deployment.yaml @@ -38,13 +38,10 @@ items: chown -R 33:33 /opt/chandler/extensions/available/openvk/tmp/api-storage/audios chown -R 33:33 /opt/chandler/extensions/available/openvk/tmp/api-storage/photos chown -R 33:33 /opt/chandler/extensions/available/openvk/tmp/api-storage/videos - chown -R 33:33 /var/log/openvk sleep 600 done volumeMounts: - - mountPath: /var/log/openvk - name: openvk-logs - mountPath: /opt/chandler/extensions/available/openvk/storage name: openvk-storage - mountPath: /opt/chandler/extensions/available/openvk/tmp/api-storage/audios @@ -66,8 +63,6 @@ items: cpu: 100m memory: 512Mi volumeMounts: - - mountPath: /var/log/openvk - name: openvk-logs - mountPath: /opt/chandler/extensions/available/openvk/openvk.yml name: openvk-config subPath: openvk.yml