Merge ~ubuntu-docker-images/ubuntu-docker-images/+git/apache2:2.4-22.10 into ~ubuntu-docker-images/ubuntu-docker-images/+git/apache2:2.4-22.04

[Athos Ribeiro]

This is the proposal for the new apache2 kinietic ROCK. The new branch will be named 2.4-22.10.

This also introduces a change to forward logs to stdout/stderr but default.

Local test suite run:

$ DOCKER_IMAGE=localhost/apache2:kinetic sh apache2_test.sh
Error response from daemon: Get "http://localhost/v2/": dial tcp 127.0.0.1:80: connect: connection refused
test_default_config
test_default_config_ipv6
test_static_content
test_custom_config
test_manifest_exists

Ran 5 tests.

OK

[Sergio Durigan Junior (sergiodj)]

Thanks, Athos.

I verified that the configuration files are properly adjusted to write logs to stdout/stderr. The image builds & tests fine locally.

LGMT.

review: Approve

[Athos Ribeiro (athos-ribeiro)]

Thanks Sergio!

I created the recipe without a push rule for this one.

diff --git a/Dockerfile b/Dockerfile
index 82a612d..e137092 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:jammy
+FROM ubuntu:kinetic
 
 ENV TZ UTC
 
@@ -16,7 +16,11 @@ RUN set -eux; \
 	apache2 -v; \
 # create manifest
 	mkdir -p /usr/share/rocks; \
-	(echo "# os-release" && cat /etc/os-release && echo "# dpkg-query" && dpkg-query -f '${db:Status-Abbrev},${binary:Package},${Version},${source:Package},${Source:Version}\n' -W) > /usr/share/rocks/dpkg.query
+	(echo "# os-release" && cat /etc/os-release && echo "# dpkg-query" && dpkg-query -f '${db:Status-Abbrev},${binary:Package},${Version},${source:Package},${Source:Version}\n' -W) > /usr/share/rocks/dpkg.query; \
+# Write logs to stderr/stdout
+	sed -i 's|^ErrorLog .*$|ErrorLog /dev/stderr|' /etc/apache2/apache2.conf; \
+	sed -i '/^ErrorLog /a TransferLog /dev/stdout' /etc/apache2/apache2.conf; \
+	sed -i -e '/ErrorLog /d' -e '/CustomLog /d' /etc/apache2/sites-available/000-default.conf /etc/apache2/sites-available/default-ssl.conf
 
 # https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop
 STOPSIGNAL SIGWINCH