Merge ~ubuntu-docker-images/ubuntu-docker-images/+git/cortex:1.7-21.04-fix-missing-manifest into ~ubuntu-docker-images/ubuntu-docker-images/+git/cortex:1.7-21.04

[Athos Ribeiro]

Using pipes without properly handling the earlier commands may conceal errors even when "set -e" is used.

Since setting the pipefail option may not be an alternative (we are
using dash), we should refactor commands using pipes to avoid concealing
errors.

This should avoid releasing images with missing bits.

[Sergio Durigan Junior (sergiodj)]

LGTM, thanks.

review: Approve

diff --git a/oci/Dockerfile.ubuntu b/oci/Dockerfile.ubuntu
index 0775c33..237d6f9 100644
--- a/oci/Dockerfile.ubuntu
+++ b/oci/Dockerfile.ubuntu
@@ -28,8 +28,10 @@ RUN set -eux; \
 #
 # https://github.com/golang/go/issues/35224
 # https://bugs.launchpad.net/docker.io/+bug/1916296
-	go list -mod=mod -m all | tail -n +2 > /src/cortex/cortex-mods.txt; \
-	/src/cortex/utils/golang-manifest-builder.py /src/cortex/cortex-mods.txt | tee /src/cortex/manifest-upstream.txt
+	go list -mod=mod -m all > /tmp/cortex-go-list.output; \
+	tail -n +2 /tmp/cortex-go-list.output > /src/cortex/cortex-mods.txt; \
+	/src/cortex/utils/golang-manifest-builder.py /src/cortex/cortex-mods.txt > /src/cortex/manifest-upstream.txt; \
+	cat /src/cortex/manifest-upstream.txt;
 
 # Prepare the final container
 FROM ubuntu:hirsute