From a620e9ca7a1d648bade22093e4bff1e38924704b Mon Sep 17 00:00:00 2001
From: Ross <rtann@redhat.com>
Date: Fri, 4 Jun 2021 12:35:53 -0700
Subject: [PATCH] Update go versions and docker/image versions (#78)

---
 images/Dockerfile.collector      | 2 +-
 images/Dockerfile.jenkins-plugin | 8 ++++----
 images/Dockerfile.rox            | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/images/Dockerfile.collector b/images/Dockerfile.collector
index 82e63494..202008a6 100644
--- a/images/Dockerfile.collector
+++ b/images/Dockerfile.collector
@@ -1,4 +1,4 @@
-FROM circleci/golang:1.16.2-buster
+FROM circleci/golang:1.16.4-buster
 
 USER 0
 
diff --git a/images/Dockerfile.jenkins-plugin b/images/Dockerfile.jenkins-plugin
index 235f9d73..b81a9b57 100644
--- a/images/Dockerfile.jenkins-plugin
+++ b/images/Dockerfile.jenkins-plugin
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 # This line makes sure that piped commands in RUN instructions exit early.
 # This should not affect use in CircleCI because Circle doesn't use
@@ -11,14 +11,14 @@ RUN set -ex \
  && apt-get update \
  && apt-get install --no-install-recommends -y \
       curl \
-      ca-certificates=20180409 \
+      ca-certificates \
       git \
       openjdk-8-jdk-headless \
       maven \
       unzip \
       openssh-client \
       sudo \
-      wget=1.19.4-1ubuntu2.2 \
+      wget \
       zip \
  && rm -rf /var/lib/apt/lists/*
 
@@ -35,7 +35,7 @@ RUN set -ex \
  && echo 'circleci ALL=NOPASSWD: ALL' > /etc/sudoers.d/50-circleci
 
 # Install docker binary
-ARG DOCKER_VERSION=18.06.1-ce
+ARG DOCKER_VERSION=20.10.6
 RUN set -ex \
  && DOCKER_URL="https://download.docker.com/linux/static/stable/x86_64/docker-${DOCKER_VERSION}.tgz" \
  && echo Docker URL: $DOCKER_URL \
diff --git a/images/Dockerfile.rox b/images/Dockerfile.rox
index 381b0e10..0622b1a3 100644
--- a/images/Dockerfile.rox
+++ b/images/Dockerfile.rox
@@ -112,8 +112,8 @@ RUN set -ex \
 
 # Install Go
 # https://golang.org/dl/
-ARG GOLANG_VERSION=1.16.4
-ARG GOLANG_SHA256=7154e88f5a8047aad4b80ebace58a059e36e7e2e4eb3b383127a28c711b4ff59
+ARG GOLANG_VERSION=1.16.5
+ARG GOLANG_SHA256=b12c23023b68de22f74c0524f10b753e7b08b1504cb7e417eccebdd3fae49061
 ENV GOPATH=/go
 ENV PATH=$GOPATH/bin:/usr/local/go/bin:$PATH
 RUN set -ex \