verify-repo-update: Fix Dockerfile.deb (#24030)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

scripts/verify-repo-update/Dockerfile.deb

@@ -1,9 +1,8 @@
-FROM ubuntu
+FROM ubuntu:20.04
 
 ARG REPO_CONFIG=grafana.list.oss
 ARG PACKAGE=grafana
 
-COPY sources.list /etc/apt/sources.list
 RUN apt update && \
     apt install -y curl                \
                    apt-transport-https \

scripts/verify-repo-update/Dockerfile.rpm

@@ -1,4 +1,4 @@
-FROM centos
+FROM centos:8
 
 ARG REPO_CONFIG=grafana.repo.oss
 ARG PACKAGE=grafana

scripts/verify-repo-update/sources.list

@@ -1,49 +0,0 @@
-# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to
-# newer versions of the distribution.
-deb http://ubuntu.mirror.su.se/ubuntu/ bionic main restricted
-# deb-src http://ubuntu.mirror.su.se/ubuntu/ bionic main restricted
-
-## Major bug fix updates produced after the final release of the
-## distribution.
-deb http://ubuntu.mirror.su.se/ubuntu/ bionic-updates main restricted
-# deb-src http://ubuntu.mirror.su.se/ubuntu/ bionic-updates main restricted
-
-## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
-## team. Also, please note that software in universe WILL NOT receive any
-## review or updates from the Ubuntu security team.
-deb http://ubuntu.mirror.su.se/ubuntu/ bionic universe
-# deb-src http://ubuntu.mirror.su.se/ubuntu/ bionic universe
-deb http://ubuntu.mirror.su.se/ubuntu/ bionic-updates universe
-# deb-src http://ubuntu.mirror.su.se/ubuntu/ bionic-updates universe
-
-## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu
-## team, and may not be under a free licence. Please satisfy yourself as to
-## your rights to use the software. Also, please note that software in
-## multiverse WILL NOT receive any review or updates from the Ubuntu
-## security team.
-deb http://ubuntu.mirror.su.se/ubuntu/ bionic multiverse
-# deb-src http://ubuntu.mirror.su.se/ubuntu/ bionic multiverse
-deb http://ubuntu.mirror.su.se/ubuntu/ bionic-updates multiverse
-# deb-src http://ubuntu.mirror.su.se/ubuntu/ bionic-updates multiverse
-
-## N.B. software from this repository may not have been tested as
-## extensively as that contained in the main release, although it includes
-## newer versions of some applications which may provide useful features.
-## Also, please note that software in backports WILL NOT receive any review
-## or updates from the Ubuntu security team.
-deb http://ubuntu.mirror.su.se/ubuntu/ bionic-backports main restricted universe multiverse
-# deb-src http://ubuntu.mirror.su.se/ubuntu/ bionic-backports main restricted universe multiverse
-
-## Uncomment the following two lines to add software from Canonical's
-## 'partner' repository.
-## This software is not part of Ubuntu, but is offered by Canonical and the
-## respective vendors as a service to Ubuntu users.
-# deb http://archive.canonical.com/ubuntu bionic partner
-# deb-src http://archive.canonical.com/ubuntu bionic partner
-
-deb http://security.ubuntu.com/ubuntu/ bionic-security main restricted
-# deb-src http://security.ubuntu.com/ubuntu/ bionic-security main restricted
-deb http://security.ubuntu.com/ubuntu/ bionic-security universe
-# deb-src http://security.ubuntu.com/ubuntu/ bionic-security universe
-deb http://security.ubuntu.com/ubuntu/ bionic-security multiverse
-# deb-src http://security.ubuntu.com/ubuntu/ bionic-security multiverse

scripts/verify-repo-update/verify-repos.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -e
+set -eo pipefail
 
 _basedir=$(dirname "$0")
 cd "$_basedir"