From 3b603d319ee5f1f1436cd383505c47ec853c32c5 Mon Sep 17 00:00:00 2001
From: Edward Thomson <ethomson@edwardthomson.com>
Date: Mon, 23 Aug 2021 15:00:39 -0400
Subject: [PATCH 1/2] ci: tag new containers with the latest tag

---
 .github/workflows/main.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d1a0be720..b58f57758 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -70,7 +70,9 @@ jobs:
           BASE_ARG="--build-arg BASE=${{ matrix.container.base }}"
         fi
         docker build -t ${{ env.docker-registry-container-sha }} ${BASE_ARG} -f ${{ env.dockerfile }} .
+        docker tag ${{ env.docker-registry-container-sha }} ${{ env.docker-registry-container-latest }}
         docker push ${{ env.docker-registry-container-sha }}
+        docker push ${{ env.docker-registry-container-latest }}
       working-directory: ${{ env.docker-config-path }}
       if: github.event_name != 'pull_request' && env.docker-container-exists != 'true'
 

From dbcb1cd74696ea54fa0d80bc33f659a27d1254bf Mon Sep 17 00:00:00 2001
From: Edward Thomson <ethomson@edwardthomson.com>
Date: Mon, 23 Aug 2021 15:02:49 -0400
Subject: [PATCH 2/2] ci: update container versions

Update all the container versions to force a rebuild so that they'll get
tagged with latest (due to changes in the CI scripts).
---
 ci/docker/bionic   | 1 +
 ci/docker/centos7  | 1 +
 ci/docker/centos8  | 1 +
 ci/docker/docurium | 1 +
 ci/docker/focal    | 1 +
 ci/docker/xenial   | 1 +
 6 files changed, 6 insertions(+)

diff --git a/ci/docker/bionic b/ci/docker/bionic
index fb6a34b1c..51af5c01c 100644
--- a/ci/docker/bionic
+++ b/ci/docker/bionic
@@ -1,4 +1,5 @@
 ARG BASE=ubuntu:bionic
+
 FROM ${BASE} AS apt
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
diff --git a/ci/docker/centos7 b/ci/docker/centos7
index 082b9e225..098edb26a 100644
--- a/ci/docker/centos7
+++ b/ci/docker/centos7
@@ -1,4 +1,5 @@
 ARG BASE=centos:7
+
 FROM ${BASE} AS yum
 RUN yum install -y \
 	which \
diff --git a/ci/docker/centos8 b/ci/docker/centos8
index e1fb7684a..f47198446 100644
--- a/ci/docker/centos8
+++ b/ci/docker/centos8
@@ -1,4 +1,5 @@
 ARG BASE=centos:8
+
 FROM ${BASE} AS yum
 RUN yum install -y \
 	which \
diff --git a/ci/docker/docurium b/ci/docker/docurium
index 7aa247532..1957bbb3b 100644
--- a/ci/docker/docurium
+++ b/ci/docker/docurium
@@ -1,4 +1,5 @@
 ARG BASE=ubuntu:bionic
+
 FROM ${BASE}
 RUN apt update && apt install -y cmake pkg-config ruby ruby-dev llvm libclang-dev libssl-dev python-pygments
 RUN gem install docurium
diff --git a/ci/docker/focal b/ci/docker/focal
index c0c57f640..171387698 100644
--- a/ci/docker/focal
+++ b/ci/docker/focal
@@ -1,4 +1,5 @@
 ARG BASE=ubuntu:focal
+
 FROM ${BASE} AS apt
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
diff --git a/ci/docker/xenial b/ci/docker/xenial
index d2ba0313f..4c3810af4 100644
--- a/ci/docker/xenial
+++ b/ci/docker/xenial
@@ -1,4 +1,5 @@
 ARG BASE=ubuntu:xenial
+
 FROM ${BASE} AS apt
 RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \