Merge ~ubuntu-docker-images/ubuntu-docker-images/+git/apache2:2.4-21.04 into ~ubuntu-docker-images/ubuntu-docker-images/+git/apache2:edge

[Bryce Harrington]

Enforce consistency across Dockerfile's

Please review with an eye towards cross-package standardization of packaging.
Particular strategic questions that this MP poses includes:

  * Should images adhere to base dist images, or fully update to current?
  * Perform smoke checks, consistently
  * Perform a full-upgrade on container before installing on it
  * Use --no-install-recommends
  * Use set -eux consistently

[Bryce Harrington (bryce)]

Sorry, I realized after pushing, that this work should have been done in side-branches, and proposed to merge into the 2.4-21.04 branch. Will remember to do that for next time.

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Bryce. I'm leaving a comment about the usage of ";" instead of "&&".

[Bryce Harrington (bryce)]

Thanks, response with counter-argument inline.

[Sergio Durigan Junior (sergiodj)]

Thanks for the reply. OK, I see you've put a lot of thought into the matter! I really have no counter-counter argument here, and honestly my own comment was more of a cosmetic thing (because, as I said, I was concerned about the "feeling" that one might have when reading the code).

Having said that, I'd say this is OK and I'm +1 on the changes. Thanks.

review: Approve

ff2d1e0... by Sergio Durigan Junior on 2021-03-02

Update README.md and HACKING.md

Signed-off-by: Sergio Durigan Junior <email address hidden>

diff --git a/Dockerfile b/Dockerfile
index 8cdd1ca..7066d46 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,235 +1,22 @@
-FROM ubuntu:focal
-
-# ENV HTTPD_PREFIX /usr/local/apache2
-# ENV PATH $HTTPD_PREFIX/bin:$PATH
-# RUN mkdir -p "$HTTPD_PREFIX" \
-# 	&& chown www-data:www-data "$HTTPD_PREFIX"
-# WORKDIR $HTTPD_PREFIX
-
-# install httpd runtime dependencies
-# https://httpd.apache.org/docs/2.4/install.html#requirements
-# RUN set -eux; \
-# 	apt-get update; \
-# 	apt-get install -y --no-install-recommends \
-# 		libaprutil1-ldap \
-# 	; \
-# 	rm -rf /var/lib/apt/lists/*
-
-# ENV HTTPD_VERSION 2.4.46
-# ENV HTTPD_SHA256 740eddf6e1c641992b22359cabc66e6325868c3c5e2e3f98faf349b61ecf41ea
-
-# # https://httpd.apache.org/security/vulnerabilities_24.html
-# ENV HTTPD_PATCHES=""
-
-# # see https://httpd.apache.org/docs/2.4/install.html#requirements
-# RUN set -eux; \
-# 	\
-# 	# mod_http2 mod_lua mod_proxy_html mod_xml2enc
-# 	# https://anonscm.debian.org/cgit/pkg-apache/apache2.git/tree/debian/control?id=adb6f181257af28ee67af15fc49d2699a0080d4c
-# 	savedAptMark="$(apt-mark showmanual)"; \
-# 	apt-get update; \
-# 	apt-get install -y --no-install-recommends \
-# 		bzip2 \
-# 		ca-certificates \
-# 		dirmngr \
-# 		dpkg-dev \
-# 		gcc \
-# 		gnupg \
-# 		libapr1-dev \
-# 		libaprutil1-dev \
-# 		libbrotli-dev \
-# 		libcurl4-openssl-dev \
-# 		libjansson-dev \
-# 		liblua5.2-dev \
-# 		libnghttp2-dev \
-# 		libpcre3-dev \
-# 		libssl-dev \
-# 		libxml2-dev \
-# 		make \
-# 		wget \
-# 		zlib1g-dev \
-# 	; \
-# 	rm -r /var/lib/apt/lists/*; \
-# 	\
-# 	ddist() { \
-# 		local f="$1"; shift; \
-# 		local distFile="$1"; shift; \
-# 		local success=; \
-# 		local distUrl=; \
-# 		for distUrl in \
-# # https://issues.apache.org/jira/browse/INFRA-8753?focusedCommentId=14735394#comment-14735394
-# 			'https://www.apache.org/dyn/closer.cgi?action=download&filename=' \
-# # if the version is outdated (or we're grabbing the .asc file), we might have to pull from the dist/archive :/
-# 			https://www-us.apache.org/dist/ \
-# 			https://www.apache.org/dist/ \
-# 			https://archive.apache.org/dist/ \
-# 		; do \
-# 			if wget -O "$f" "$distUrl$distFile" && [ -s "$f" ]; then \
-# 				success=1; \
-# 				break; \
-# 			fi; \
-# 		done; \
-# 		[ -n "$success" ]; \
-# 	}; \
-# 	\
-# 	ddist 'httpd.tar.bz2' "httpd/httpd-$HTTPD_VERSION.tar.bz2"; \
-# 	echo "$HTTPD_SHA256 *httpd.tar.bz2" | sha256sum -c -; \
-# 	\
-# # see https://httpd.apache.org/download.cgi#verify
-# 	ddist 'httpd.tar.bz2.asc' "httpd/httpd-$HTTPD_VERSION.tar.bz2.asc"; \
-# 	export GNUPGHOME="$(mktemp -d)"; \
-# # $ docker run --rm buildpack-deps:buster-curl bash -c 'wget -qO- https://downloads.apache.org/httpd/KEYS | gpg --batch --import &> /dev/null && gpg --batch --list-keys --with-fingerprint --with-colons' | awk -F: '$1 == "pub" && $2 == "-" { pub = 1 } pub && $1 == "fpr" { fpr = $10 } $1 == "sub" { pub = 0 } pub && fpr && $1 == "uid" && $2 == "-" { print "#", $10; print "\t\t" fpr " \\"; pub = 0 }'
-# 	for key in \
-# # Rodent of Unusual Size (DSA) <[e-mail]>
-# 		DE29FB3971E71543FD2DC049508EAEC5302DA568 \
-# # Rodent of Unusual Size <[e-mail]>
-# 		13155B0E9E634F42BF6C163FDDBA64BA2C312D2F \
-# # Jim Jagielski <[e-mail]>
-# 		8B39757B1D8A994DF2433ED58B3A601F08C975E5 \
-# # Dean Gaudet <[e-mail]>
-# 		31EE1A81B8D066548156D37B7D6DBFD1F08E012A \
-# # Cliff Woolley <[e-mail]>
-# 		A10208FEC3152DD7C0C9B59B361522D782AB7BD1 \
-# # Cliff Woolley <[e-mail]>
-# 		3DE024AFDA7A4B15CB6C14410F81AA8AB0D5F771 \
-# # Graham Leggett <[e-mail]>
-# 		EB138C6AF0FC691001B16D93344A844D751D7F27 \
-# # Roy T. Fielding <[e-mail]>
-# 		CBA5A7C21EC143314C41393E5B968010E04F9A89 \
-# # Justin R. Erenkrantz <[e-mail]>
-# 		3C016F2B764621BB549C66B516A96495E2226795 \
-# # Aaron Bannert <[e-mail]>
-# 		937FB3994A242BA9BF49E93021454AF0CC8B0F7E \
-# # Brad Nicholes <[e-mail]>
-# 		EAD1359A4C0F2D37472AAF28F55DF0293A4E7AC9 \
-# # Sander Striker <[e-mail]>
-# 		4C1EADADB4EF5007579C919C6635B6C0DE885DD3 \
-# # Greg Stein <[e-mail]>
-# 		01E475360FCCF1D0F24B9D145D414AE1E005C9CB \
-# # Andre Malo <[e-mail]>
-# 		92CCEF0AA7DD46AC3A0F498BCA6939748103A37E \
-# # Erik Abele <[e-mail]>
-# 		D395C7573A68B9796D38C258153FA0CD75A67692 \
-# # Astrid Kessler (Kess) <[e-mail]>
-# 		FA39B617B61493FD283503E7EED1EA392261D073 \
-# # Joe Schaefer <[e-mail]>
-# 		984FB3350C1D5C7A3282255BB31B213D208F5064 \
-# # Stas Bekman <[e-mail]>
-# 		FE7A49DAA875E890B4167F76CCB2EB46E76CF6D0 \
-# # Paul Querna <[e-mail]>
-# 		39F6691A0ECF0C50E8BB849CF78875F642721F00 \
-# # Colm MacCarthaigh <[e-mail]>
-# 		29A2BA848177B73878277FA475CAA2A3F39B3750 \
-# # Ruediger Pluem <[e-mail]>
-# 		120A8667241AEDD4A78B46104C042818311A3DE5 \
-# # Nick Kew <[e-mail]>
-# 		453510BDA6C5855624E009236D0BC73A40581837 \
-# # Philip M. Gollucci <[e-mail]>
-# 		0DE5C55C6BF3B2352DABB89E13249B4FEC88A0BF \
-# # Bojan Smojver <[e-mail]>
-# 		7CDBED100806552182F98844E8E7E00B4DAA1988 \
-# # Issac Goldstand <[e-mail]>
-# 		A8BA9617EF3BCCAC3B29B869EDB105896F9522D8 \
-# # "Guenter Knauf" ("CODE SIGNING KEY") <[e-mail]>
-# 		3E6AC004854F3A7F03566B592FF06894E55B0D0E \
-# # Jeff Trawick (CODE SIGNING KEY) <[e-mail]>
-# 		5B5181C2C0AB13E59DA3F7A3EC582EB639FF092C \
-# # Jim Jagielski (Release Signing Key) <[e-mail]>
-# 		A93D62ECC3C8EA12DB220EC934EA76E6791485A8 \
-# # Eric Covener <[e-mail]>
-# 		65B2D44FE74BD5E3DE3AC3F082781DE46D5954FA \
-# # Yann Ylavic <[e-mail]>
-# 		8935926745E1CE7E3ED748F6EC99EE267EB5F61A \
-# # Daniel Ruggeri (http\x3a//home.apache.org/~druggeri/) <[e-mail]>
-# 		B9E8213AEFB861AF35A41F2C995E35221AD84DFF \
-# # Daniel Ruggeri (http\x3a//home.apache.org/~druggeri/) <[e-mail]>
-# 		E3480043595621FE56105F112AB12A7ADC55C003 \
-# # Joe Orton (Release Signing Key) <[e-mail]>
-# 		93525CFCF6FDFFB3FD9700DD5A4B10AE43B56A27 \
-# 	; do \
-# 		gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys "$key"; \
-# 	done; \
-# 	gpg --batch --verify httpd.tar.bz2.asc httpd.tar.bz2; \
-# 	command -v gpgconf && gpgconf --kill all || :; \
-# 	rm -rf "$GNUPGHOME" httpd.tar.bz2.asc; \
-# 	\
-# 	mkdir -p src; \
-# 	tar -xf httpd.tar.bz2 -C src --strip-components=1; \
-# 	rm httpd.tar.bz2; \
-# 	cd src; \
-# 	\
-# 	patches() { \
-# 		while [ "$#" -gt 0 ]; do \
-# 			local patchFile="$1"; shift; \
-# 			local patchSha256="$1"; shift; \
-# 			ddist "$patchFile" "httpd/patches/apply_to_$HTTPD_VERSION/$patchFile"; \
-# 			echo "$patchSha256 *$patchFile" | sha256sum -c -; \
-# 			patch -p0 < "$patchFile"; \
-# 			rm -f "$patchFile"; \
-# 		done; \
-# 	}; \
-# 	patches $HTTPD_PATCHES; \
-# 	\
-# 	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
-# 	CFLAGS="$(dpkg-buildflags --get CFLAGS)"; \
-# 	CPPFLAGS="$(dpkg-buildflags --get CPPFLAGS)"; \
-# 	LDFLAGS="$(dpkg-buildflags --get LDFLAGS)"; \
-# 	./configure \
-# 		--build="$gnuArch" \
-# 		--prefix="$HTTPD_PREFIX" \
-# 		--enable-mods-shared=reallyall \
-# 		--enable-mpms-shared=all \
-# # enable the same hardening flags as Debian
-# # - https://salsa.debian.org/apache-team/apache2/blob/87db7de4e59683fb03e97900f078d06ef2292748/debian/rules#L19-21
-# # - https://salsa.debian.org/apache-team/apache2/blob/87db7de4e59683fb03e97900f078d06ef2292748/debian/rules#L115
-# 		--enable-pie \
-# 		CFLAGS="-pipe $CFLAGS" \
-# 		CPPFLAGS="$CPPFLAGS" \
-# 		LDFLAGS="-Wl,--as-needed $LDFLAGS" \
-# 	; \
-# 	make -j "$(nproc)"; \
-# 	make install; \
-# 	\
-# 	cd ..; \
-# 	rm -r src man manual; \
-# 	\
-# 	sed -ri \
-# 		-e 's!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g' \
-# 		-e 's!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g' \
-# 		-e 's!^(\s*TransferLog)\s+\S+!\1 /proc/self/fd/1!g' \
-# 		"$HTTPD_PREFIX/conf/httpd.conf" \
-# 		"$HTTPD_PREFIX/conf/extra/httpd-ssl.conf" \
-# 	; \
-# 	\
-# # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
-# 	apt-mark auto '.*' > /dev/null; \
-# 	[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
-# 	find /usr/local -type f -executable -exec ldd '{}' ';' \
-# 		| awk '/=>/ { print $(NF-1) }' \
-# 		| sort -u \
-# 		| xargs -r dpkg-query --search \
-# 		| cut -d: -f1 \
-# 		| sort -u \
-# 		| xargs -r apt-mark manual \
-# 	; \
-# 	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false; \
-# 	\
-# # smoke test
-# 	httpd -v
+FROM ubuntu:hirsute
 
 ENV TZ UTC
 
 RUN set -eux; \
-	apt-get update \
-	&& DEBIAN_FRONTEND=noninteractive apt-get upgrade -y \
-# Needed for generating random passwords.
-	&& DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y apache2 tzdata \
-	&& rm -rf /var/lib/apt/lists/* \
+# installation
+	apt-get update; \
+	DEBIAN_FRONTEND=noninteractive apt-get full-upgrade -y; \
+	DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+		apache2 \
+		tzdata \
+		; \
+	DEBIAN_FRONTEND=noninteractive apt-get remove --purge --auto-remove -y; \
+	rm -rf /var/lib/apt/lists/*; \
 # smoke test
-	&& apache2 -v \
+	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
+	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
 
 # https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop
 STOPSIGNAL SIGWINCH
diff --git a/HACKING.md b/HACKING.md
index 88f31ec..256cf0a 100644
--- a/HACKING.md
+++ b/HACKING.md
@@ -1,7 +1,7 @@
 # Contributing
 
 In Ubuntu, Apache2 is available as a `.deb` package.  For this reason,
-this image was built by installing the Apache2 Ubuntu Focal package
+this image was built by installing the Apache2 Ubuntu 21.04 package
 inside a docker container.
 
 In order to contribute to the Apache2 OCI image, do the following:
diff --git a/README.md b/README.md
index 2d96fd9..c49f2ad 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ _Tags in italics are not available in ubuntu/apache2 but are shown here for comp
 
 | Channel Tag | | | Currently | Architectures |
 |---|---|---|---|---|
-| **`2.4-20.04_beta`** &nbsp;&nbsp; | | | Apache2 2.4.41 on Ubuntu 20.04 LTS | `amd64`, `arm64`, `ppc64el`, `s390x` |
+| **`2.4-21.04_beta`** &nbsp;&nbsp; | | | Apache2 2.4.46 on Ubuntu 21.04 | `amd64`, `arm64`, `ppc64el`, `s390x` |
 | _`track_risk`_ |
 
 Channel tag shows the most stable channel for that track ordered `stable`, `candidate`, `beta`, `edge`. More risky channels are always implicitly available. So if `beta` is listed, you can also pull `edge`. If `candidate` is listed, you can pull `beta` and `edge`. When `stable` is listed, all four are available. Images are guaranteed to progress through the sequence `edge`, `beta`, `candidate` before `stable`.
@@ -30,7 +30,7 @@ Channel tag shows the most stable channel for that track ordered `stable`, `cand
 Launch this image locally:
 
 ```sh
-docker run -d --name apache2-container -e TZ=UTC -p 8080:80 ubuntu/apache2:2.4-20.04_beta
+docker run -d --name apache2-container -e TZ=UTC -p 8080:80 ubuntu/apache2:2.4-21.04_beta
 ```
 Access your Apache2 server at `http://localhost:8080`.
 
@@ -65,7 +65,7 @@ Works with any Kubernetes; if you don't have one, we recommend you [install Micr
 
 Download
 [apache2.conf](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/apache2.conf), [index.html](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/config/html/index.html) and
-[apache2-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/apache2-deployment.yml) and set `containers.apache2.image` in `apache2-deployment.yml` to your chosen channel tag (e.g. `ubuntu/apache2:2.4-20.04_beta`), then:
+[apache2-deployment.yml](https://git.launchpad.net/~canonical-server/ubuntu-docker-images/+git/apache2/plain/examples/apache2-deployment.yml) and set `containers.apache2.image` in `apache2-deployment.yml` to your chosen channel tag (e.g. `ubuntu/apache2:2.4-21.04_beta`), then:
 
 ```sh
 kubectl create configmap apache2-config --from-file=apache2=apache2.conf --from-file=apache2-site=index.html
diff --git a/data/apache2.yaml b/data/apache2.yaml
index e95c47f..5898835 100644
--- a/data/apache2.yaml
+++ b/data/apache2.yaml
@@ -3,8 +3,8 @@ main: true
 repo: apache2
 description: >
   The Apache HTTP Server Project's goal is to build a secure, efficient and extensible HTTP server as standards-compliant open source software. The result has long been the number one web server on the Internet. Read more on the [apache2 website](https://httpd.apache.org/).
-version: 2.4.41
-base: Ubuntu 20.04 LTS
+version: 2.4.46
+base: Ubuntu 21.04
 architectures:
   - amd64
   - arm64