Merge ~ubuntu-docker-images/ubuntu-docker-images/+git/memcached:resync-20.04-with-21.04 into ~ubuntu-docker-images/ubuntu-docker-images/+git/memcached:edge

[Bryce Harrington]

Resync with Dockerfile from the 21.04 branch

[Sergio Durigan Junior (sergiodj)]

Thanks, Bryce.

I thought it was strange to see my "Create manifest" commit in the list of unmerged commits, but then I noticed that this MP is set to be merged against the "edge" branch. Just a heads up.

Builds and tests fine. LGTM, +1.

review: Approve

[Bryce Harrington (bryce)]

On Wed, Mar 24, 2021 at 02:36:16AM -0000, Sergio Durigan Junior wrote:
> Review: Approve
>
> Thanks, Bryce.
>
> I thought it was strange to see my "Create manifest" commit in the list of unmerged commits, but then I noticed that this MP is set to be merged against the "edge" branch. Just a heads up.
>
> Builds and tests fine. LGTM, +1.

Probably an artifact in my .git/config from before the branch split.
I'll make sure they're landed in the right origin branches, and fix up
the .git/configs properly.

diff --git a/Dockerfile b/Dockerfile
index 646f4d0..5cf5025 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,20 +2,30 @@ FROM ubuntu:focal
 
 ENV TZ UTC
 
+RUN set -eux; \
+# installation
+	apt-get update; \
+	DEBIAN_FRONTEND=noninteractive apt-get full-upgrade -y; \
+	DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
 # ensure SASL's "libplain.so" is installed as per https://github.com/memcached/memcached/wiki/SASLHowto
-RUN set -eux \
-	&& apt-get update \
-	&& DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
 		libsasl2-modules \
-                memcached \
-                tzdata \
-	&& rm -rf /var/lib/apt/lists/* \
-        && memcached -V
+		memcached \
+		tzdata \
+		; \
+	DEBIAN_FRONTEND=noninteractive apt-get remove --purge --auto-remove -y; \
+	rm -rf /var/lib/apt/lists/*; \
+# smoke test
+	memcached -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
+
 
 COPY docker-entrypoint.sh /usr/local/bin/
 RUN ln -s usr/local/bin/docker-entrypoint.sh /entrypoint.sh # backwards compat
 ENTRYPOINT ["docker-entrypoint.sh"]
 
 USER memcache
+
 EXPOSE 11211
 CMD ["memcached"]