Merge pull request #1385 from caseydavenport/casey-update-repo-v3.20

Update to UBI 8.5 and go-build v0.54

Author: caseydavenport

Dockerfile.amd64

@@ -25,7 +25,7 @@ FROM ${BIRD_IMAGE} as bird
 # Use this build stage to build iptables rpm and runit binaries.
 # We need to rebuild the iptables rpm because the prepackaged rpm does not have legacy iptables binaries.
 # We need to build runit because there aren't any rpms for it in CentOS or ubi repositories.
-FROM centos:8 as centos
+FROM quay.io/centos/centos:stream8 as centos
 
 ARG ARCH
 ARG IPTABLES_VER
@@ -95,7 +95,7 @@ RUN wget -P /tmp https://ftp.debian.org/debian/pool/main/r/runit/runit_${RUNIT_V
     cd /tmp/admin/runit-${RUNIT_VER}/ && \
     package/install
 
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.4 as ubi
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.5 as ubi
 ARG ARCH
 ARG GIT_VERSION
 ARG IPTABLES_VER