From 79f92b71cbf15c051c4d7ef9a7248cfab4f8117c Mon Sep 17 00:00:00 2001
From: John Murret <john.murret@hashicorp.com>
Date: Mon, 26 Jun 2023 17:38:20 -0600
Subject: [PATCH 01/14] adding docker files to verify linux packages.

---
 .../docker/Verify-Release-Amazon.dockerfile          | 11 +++++++++++
 .../docker/Verify-Release-CentOS.dockerfile          | 11 +++++++++++
 .../docker/Verify-Release-Debian.dockerfile          | 12 ++++++++++++
 .../docker/Verify-Release-Fedora.dockerfile          | 10 ++++++++++
 .../docker/Verify-Release-Ubuntu.dockerfile          | 12 ++++++++++++
 5 files changed, 56 insertions(+)
 create mode 100644 build-support/docker/Verify-Release-Amazon.dockerfile
 create mode 100644 build-support/docker/Verify-Release-CentOS.dockerfile
 create mode 100644 build-support/docker/Verify-Release-Debian.dockerfile
 create mode 100644 build-support/docker/Verify-Release-Fedora.dockerfile
 create mode 100644 build-support/docker/Verify-Release-Ubuntu.dockerfile

diff --git a/build-support/docker/Verify-Release-Amazon.dockerfile b/build-support/docker/Verify-Release-Amazon.dockerfile
new file mode 100644
index 000000000000..6265668ebf68
--- /dev/null
+++ b/build-support/docker/Verify-Release-Amazon.dockerfile
@@ -0,0 +1,11 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+FROM amazonlinux:latest
+
+RUN yum install -y yum-utils shadow-utils
+RUN yum-config-manager --add-repo https://rpm.releases.hashicorp.com/AmazonLinux/hashicorp.repo
+ARG PACKAGE=consul \
+ARG VERSION \
+ARG SUFFIX=1
+RUN yum install -y ${PACKAGE}-${VERSION}-${SUFFIX}
\ No newline at end of file
diff --git a/build-support/docker/Verify-Release-CentOS.dockerfile b/build-support/docker/Verify-Release-CentOS.dockerfile
new file mode 100644
index 000000000000..c83341ccb76a
--- /dev/null
+++ b/build-support/docker/Verify-Release-CentOS.dockerfile
@@ -0,0 +1,11 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+
+FROM centos:7
+RUN yum install -y yum-utils
+RUN yum-config-manager --add-repo https://rpm.releases.hashicorp.com/RHEL/hashicorp.repo
+ARG PACKAGE=consul \
+ARG VERSION \
+ARG SUFFIX=1
+RUN yum install -y ${PACKAGE}-${VERSION}-${SUFFIX}
\ No newline at end of file
diff --git a/build-support/docker/Verify-Release-Debian.dockerfile b/build-support/docker/Verify-Release-Debian.dockerfile
new file mode 100644
index 000000000000..31846d0fbca3
--- /dev/null
+++ b/build-support/docker/Verify-Release-Debian.dockerfile
@@ -0,0 +1,12 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+FROM debian:bullseye
+RUN apt update && apt install -y software-properties-common curl gnupg
+RUN curl -fsSL https://apt.releases.hashicorp.com/gpg | apt-key add -
+ARG TARGETARCH
+RUN apt-add-repository "deb [arch=${TARGETARCH}] https://apt.releases.hashicorp.com $(lsb_release -cs) main"
+ARG PACKAGE=consul \
+ARG VERSION \
+ARG SUFFIX=1
+RUN apt-get update && apt-get install -y ${PACKAGE}=${VERSION}-${SUFFIX}
\ No newline at end of file
diff --git a/build-support/docker/Verify-Release-Fedora.dockerfile b/build-support/docker/Verify-Release-Fedora.dockerfile
new file mode 100644
index 000000000000..8fcdedfda119
--- /dev/null
+++ b/build-support/docker/Verify-Release-Fedora.dockerfile
@@ -0,0 +1,10 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+FROM fedora:36
+RUN dnf install -y dnf-plugins-core
+RUN dnf config-manager --add-repo https://rpm.releases.hashicorp.com/fedora/hashicorp.repo
+ARG PACKAGE=consul \
+ARG VERSION \
+ARG SUFFIX=1
+RUN dnf install -y ${PACKAGE}-${VERSION}-${SUFFIX}
\ No newline at end of file
diff --git a/build-support/docker/Verify-Release-Ubuntu.dockerfile b/build-support/docker/Verify-Release-Ubuntu.dockerfile
new file mode 100644
index 000000000000..a6605d2d9d69
--- /dev/null
+++ b/build-support/docker/Verify-Release-Ubuntu.dockerfile
@@ -0,0 +1,12 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+FROM ubuntu:22.04
+RUN apt update && apt install -y software-properties-common curl
+RUN curl -fsSL https://apt.releases.hashicorp.com/gpg | apt-key add -
+ARG TARGETARCH
+RUN apt-add-repository "deb [arch=${TARGETARCH}] https://apt.releases.hashicorp.com $(lsb_release -cs) main"
+ARG PACKAGE=consul \
+ARG VERSION \
+ARG SUFFIX=1
+RUN apt-get update && apt-get install -y ${PACKAGE}=${VERSION}-${SUFFIX}
\ No newline at end of file

From 01f18bbf29a10f94485cd5b36ea64491f29b1cdf Mon Sep 17 00:00:00 2001
From: John Murret <john.murret@hashicorp.com>
Date: Mon, 26 Jun 2023 19:15:00 -0600
Subject: [PATCH 02/14] add verifr-release-linux.yml

---
 .github/workflows/verify-release-linux.yaml | 33 +++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 .github/workflows/verify-release-linux.yaml

diff --git a/.github/workflows/verify-release-linux.yaml b/.github/workflows/verify-release-linux.yaml
new file mode 100644
index 000000000000..e5c51b40ba98
--- /dev/null
+++ b/.github/workflows/verify-release-linux.yaml
@@ -0,0 +1,33 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+name: Broken Link Check
+
+on:
+  push:
+  workflow_dispatch:
+    inputs:
+      packageName:
+        description: 'Name of consul release package (consul vs consul-enterprise)'
+        required: true
+        default: 'consul'
+        type: choice
+        options:
+        - consul
+        - consul-enterprise
+      version:
+        description: The x.y.z version (also need to specify applicable suffixes like +ent and -dev)'
+        required: true
+        type: string
+
+env:
+  PACKAGE: ${{ inputs.packageName }}
+  VERSION: ${{ inputs.version }}
+jobs:
+  verify-ubuntu:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      - name: docker build with version
+        run: docker build --build-arg PACKAGE=${PACKAGE} --build-arg VERSION=${VERSION} -f ./build-support/docker/Verify-Release-Ubuntu.dockerfile .
+

From ede440515bfed20053938418339ef2c7d67f8b91 Mon Sep 17 00:00:00 2001
From: John Murret <john.murret@hashicorp.com>
Date: Mon, 26 Jun 2023 19:49:14 -0600
Subject: [PATCH 03/14] updating name

---
 .github/workflows/verify-release-linux.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/verify-release-linux.yaml b/.github/workflows/verify-release-linux.yaml
index e5c51b40ba98..6d74dcc3ee42 100644
--- a/.github/workflows/verify-release-linux.yaml
+++ b/.github/workflows/verify-release-linux.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: MPL-2.0
 
-name: Broken Link Check
+name: Verify Release - Linux
 
 on:
   push:

From 7d9ebba2ceaf724d7f8b46fe8744d88fef64f772 Mon Sep 17 00:00:00 2001
From: John Murret <john.murret@hashicorp.com>
Date: Mon, 26 Jun 2023 19:54:05 -0600
Subject: [PATCH 04/14] pass inputs directly into jobs

---
 .github/workflows/verify-release-linux.yaml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/verify-release-linux.yaml b/.github/workflows/verify-release-linux.yaml
index 6d74dcc3ee42..daa416a85aea 100644
--- a/.github/workflows/verify-release-linux.yaml
+++ b/.github/workflows/verify-release-linux.yaml
@@ -20,14 +20,11 @@ on:
         required: true
         type: string
 
-env:
-  PACKAGE: ${{ inputs.packageName }}
-  VERSION: ${{ inputs.version }}
 jobs:
   verify-ubuntu:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
       - name: docker build with version
-        run: docker build --build-arg PACKAGE=${PACKAGE} --build-arg VERSION=${VERSION} -f ./build-support/docker/Verify-Release-Ubuntu.dockerfile .
+        run: docker build --build-arg PACKAGE=${{ inputs.packageName }} --build-arg VERSION=${{ inputs.version }} -f ./build-support/docker/Verify-Release-Ubuntu.dockerfile .
 

From 2eda505d47c8075bd87f8aabcee519196e47578e Mon Sep 17 00:00:00 2001
From: John Murret <john.murret@hashicorp.com>
Date: Mon, 26 Jun 2023 19:56:02 -0600
Subject: [PATCH 05/14] add other linux package platforms

---
 .github/workflows/verify-release-linux.yaml | 27 +++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/.github/workflows/verify-release-linux.yaml b/.github/workflows/verify-release-linux.yaml
index daa416a85aea..25e26c9e89bb 100644
--- a/.github/workflows/verify-release-linux.yaml
+++ b/.github/workflows/verify-release-linux.yaml
@@ -28,3 +28,30 @@ jobs:
       - name: docker build with version
         run: docker build --build-arg PACKAGE=${{ inputs.packageName }} --build-arg VERSION=${{ inputs.version }} -f ./build-support/docker/Verify-Release-Ubuntu.dockerfile .
 
+  verify-debian:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      - name: docker build with version
+        run: docker build --build-arg PACKAGE=${{ inputs.packageName }} --build-arg VERSION=${{ inputs.version }} -f ./build-support/docker/Verify-Release-Debian.dockerfile .
+
+  verify-fedora:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      - name: docker build with version
+        run: docker build --build-arg PACKAGE=${{ inputs.packageName }} --build-arg VERSION=${{ inputs.version }} -f ./build-support/docker/Verify-Release-Fedora.dockerfile .
+
+  verify-centos:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      - name: docker build with version
+        run: docker build --build-arg PACKAGE=${{ inputs.packageName }} --build-arg VERSION=${{ inputs.version }} -f ./build-support/docker/Verify-Release-CentOS.dockerfile .
+
+  verify-amazon:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      - name: docker build with version
+        run: docker build --build-arg PACKAGE=${{ inputs.packageName }} --build-arg VERSION=${{ inputs.version }} -f ./build-support/docker/Verify-Release-Amazon.dockerfile .

From cb50b9879275161acbd867abd3a162028148d47d Mon Sep 17 00:00:00 2001
From: John Murret <john.murret@hashicorp.com>
Date: Mon, 26 Jun 2023 19:57:01 -0600
Subject: [PATCH 06/14] remove on push

---
 .github/workflows/verify-release-linux.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/verify-release-linux.yaml b/.github/workflows/verify-release-linux.yaml
index 25e26c9e89bb..6ed9271eb3c2 100644
--- a/.github/workflows/verify-release-linux.yaml
+++ b/.github/workflows/verify-release-linux.yaml
@@ -4,7 +4,6 @@
 name: Verify Release - Linux
 
 on:
-  push:
   workflow_dispatch:
     inputs:
       packageName:

From aacd418f2e6cb736da05f90c339e5da989159e43 Mon Sep 17 00:00:00 2001
From: John Murret <john.murret@hashicorp.com>
Date: Mon, 26 Jun 2023 20:04:34 -0600
Subject: [PATCH 07/14] fix TARGETARCH on debian and ubuntu so it can check
 arm64 and amd64

---
 .github/workflows/verify-release-linux.yaml   | 59 ++++++++++++++++---
 .../docker/Verify-Release-Debian.dockerfile   |  2 +-
 .../docker/Verify-Release-Ubuntu.dockerfile   |  2 +-
 3 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/verify-release-linux.yaml b/.github/workflows/verify-release-linux.yaml
index 6ed9271eb3c2..146b00afb2f4 100644
--- a/.github/workflows/verify-release-linux.yaml
+++ b/.github/workflows/verify-release-linux.yaml
@@ -20,37 +20,82 @@ on:
         type: string
 
 jobs:
-  verify-ubuntu:
+  verify-ubuntu-amd64:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
       - name: docker build with version
-        run: docker build --build-arg PACKAGE=${{ inputs.packageName }} --build-arg VERSION=${{ inputs.version }} -f ./build-support/docker/Verify-Release-Ubuntu.dockerfile .
+        run: |
+          docker build \
+          --build-arg PACKAGE=${{ inputs.packageName }} \
+          --build-arg VERSION=${{ inputs.version }} \
+          --build-arg TARGETARCH=amd64 \
+          -f ./build-support/docker/Verify-Release-Ubuntu.dockerfile .
+  verify-ubuntu-arm64:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      - name: docker build with version
+        run: |
+          docker build \
+          --build-arg PACKAGE=${{ inputs.packageName }} \
+          --build-arg VERSION=${{ inputs.version }} \
+          --build-arg TARGETARCH=arm64 \
+          -f ./build-support/docker/Verify-Release-Ubuntu.dockerfile .
+
+  verify-debian-amd64:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      - name: docker build with version
+        run: |
+          docker build \
+          --build-arg PACKAGE=${{ inputs.packageName }} \
+          --build-arg VERSION=${{ inputs.version }} \
+          --build-arg TARGETARCH=amd64 \
+          -f ./build-support/docker/Verify-Release-Debian.dockerfile .
 
-  verify-debian:
+  verify-debian-ard64:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
       - name: docker build with version
-        run: docker build --build-arg PACKAGE=${{ inputs.packageName }} --build-arg VERSION=${{ inputs.version }} -f ./build-support/docker/Verify-Release-Debian.dockerfile .
+        run: |
+          docker build \
+          --build-arg PACKAGE=${{ inputs.packageName }} \
+          --build-arg VERSION=${{ inputs.version }} \
+          --build-arg TARGETARCH=arm64 \
+          -f ./build-support/docker/Verify-Release-Debian.dockerfile .
 
   verify-fedora:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
       - name: docker build with version
-        run: docker build --build-arg PACKAGE=${{ inputs.packageName }} --build-arg VERSION=${{ inputs.version }} -f ./build-support/docker/Verify-Release-Fedora.dockerfile .
+        run: |
+          docker build \
+          --build-arg PACKAGE=${{ inputs.packageName }} \
+          --build-arg VERSION=${{ inputs.version }} \
+          -f ./build-support/docker/Verify-Release-Fedora.dockerfile .
 
   verify-centos:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
       - name: docker build with version
-        run: docker build --build-arg PACKAGE=${{ inputs.packageName }} --build-arg VERSION=${{ inputs.version }} -f ./build-support/docker/Verify-Release-CentOS.dockerfile .
+        run: |
+          docker build \
+          --build-arg PACKAGE=${{ inputs.packageName }} \
+          --build-arg VERSION=${{ inputs.version }} \
+          -f ./build-support/docker/Verify-Release-CentOS.dockerfile .
 
   verify-amazon:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
       - name: docker build with version
-        run: docker build --build-arg PACKAGE=${{ inputs.packageName }} --build-arg VERSION=${{ inputs.version }} -f ./build-support/docker/Verify-Release-Amazon.dockerfile .
+        run: |
+          docker build \
+          --build-arg PACKAGE=${{ inputs.packageName }} \
+          --build-arg VERSION=${{ inputs.version }} 
+          -f ./build-support/docker/Verify-Release-Amazon.dockerfile .
diff --git a/build-support/docker/Verify-Release-Debian.dockerfile b/build-support/docker/Verify-Release-Debian.dockerfile
index 31846d0fbca3..533890bca43f 100644
--- a/build-support/docker/Verify-Release-Debian.dockerfile
+++ b/build-support/docker/Verify-Release-Debian.dockerfile
@@ -4,7 +4,7 @@
 FROM debian:bullseye
 RUN apt update && apt install -y software-properties-common curl gnupg
 RUN curl -fsSL https://apt.releases.hashicorp.com/gpg | apt-key add -
-ARG TARGETARCH
+ARG TARGETARCH=amd64
 RUN apt-add-repository "deb [arch=${TARGETARCH}] https://apt.releases.hashicorp.com $(lsb_release -cs) main"
 ARG PACKAGE=consul \
 ARG VERSION \
diff --git a/build-support/docker/Verify-Release-Ubuntu.dockerfile b/build-support/docker/Verify-Release-Ubuntu.dockerfile
index a6605d2d9d69..5bb7847e25fc 100644
--- a/build-support/docker/Verify-Release-Ubuntu.dockerfile
+++ b/build-support/docker/Verify-Release-Ubuntu.dockerfile
@@ -4,7 +4,7 @@
 FROM ubuntu:22.04
 RUN apt update && apt install -y software-properties-common curl
 RUN curl -fsSL https://apt.releases.hashicorp.com/gpg | apt-key add -
-ARG TARGETARCH
+ARG TARGETARCH=amd64
 RUN apt-add-repository "deb [arch=${TARGETARCH}] https://apt.releases.hashicorp.com $(lsb_release -cs) main"
 ARG PACKAGE=consul \
 ARG VERSION \

From c48baaf61891f0e5933dad8ad523109adafe7ec3 Mon Sep 17 00:00:00 2001
From: John Murret <john.murret@hashicorp.com>
Date: Mon, 26 Jun 2023 20:13:06 -0600
Subject: [PATCH 08/14] fixing amazon to use the continue line

---
 .github/workflows/verify-release-linux.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/verify-release-linux.yaml b/.github/workflows/verify-release-linux.yaml
index 146b00afb2f4..b89850508b62 100644
--- a/.github/workflows/verify-release-linux.yaml
+++ b/.github/workflows/verify-release-linux.yaml
@@ -97,5 +97,5 @@ jobs:
         run: |
           docker build \
           --build-arg PACKAGE=${{ inputs.packageName }} \
-          --build-arg VERSION=${{ inputs.version }} 
+          --build-arg VERSION=${{ inputs.version }} \
           -f ./build-support/docker/Verify-Release-Amazon.dockerfile .

From fffae78261cc23b8096776d2ad8255a02b0d1000 Mon Sep 17 00:00:00 2001
From: John Murret <john.murret@hashicorp.com>
Date: Mon, 26 Jun 2023 22:00:25 -0600
Subject: [PATCH 09/14] add ubuntu i386

---
 .github/workflows/verify-release-linux.yaml   | 46 +++++++++++++++----
 .../Verify-Release-Ubunt-i386.dockerfile      | 12 +++++
 2 files changed, 49 insertions(+), 9 deletions(-)
 create mode 100644 build-support/docker/Verify-Release-Ubunt-i386.dockerfile

diff --git a/.github/workflows/verify-release-linux.yaml b/.github/workflows/verify-release-linux.yaml
index b89850508b62..b41272390faf 100644
--- a/.github/workflows/verify-release-linux.yaml
+++ b/.github/workflows/verify-release-linux.yaml
@@ -20,6 +20,7 @@ on:
         type: string
 
 jobs:
+# DEBIAN / AMD64
   verify-ubuntu-amd64:
     runs-on: ubuntu-latest
     steps:
@@ -31,7 +32,8 @@ jobs:
           --build-arg VERSION=${{ inputs.version }} \
           --build-arg TARGETARCH=amd64 \
           -f ./build-support/docker/Verify-Release-Ubuntu.dockerfile .
-  verify-ubuntu-arm64:
+
+  verify-debian-amd64:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
@@ -40,10 +42,11 @@ jobs:
           docker build \
           --build-arg PACKAGE=${{ inputs.packageName }} \
           --build-arg VERSION=${{ inputs.version }} \
-          --build-arg TARGETARCH=arm64 \
-          -f ./build-support/docker/Verify-Release-Ubuntu.dockerfile .
-
-  verify-debian-amd64:
+          --build-arg TARGETARCH=amd64 \
+          -f ./build-support/docker/Verify-Release-Debian.dockerfile .
+            
+# DEBIAN / i386
+  verify-ubuntu-i386:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
@@ -54,8 +57,8 @@ jobs:
           --build-arg VERSION=${{ inputs.version }} \
           --build-arg TARGETARCH=amd64 \
           -f ./build-support/docker/Verify-Release-Debian.dockerfile .
-
-  verify-debian-ard64:
+  
+  verify-debian-i386:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
@@ -64,9 +67,34 @@ jobs:
           docker build \
           --build-arg PACKAGE=${{ inputs.packageName }} \
           --build-arg VERSION=${{ inputs.version }} \
-          --build-arg TARGETARCH=arm64 \
-          -f ./build-support/docker/Verify-Release-Debian.dockerfile .
+          --build-arg TARGETARCH=i386 \
+          -f ./build-support/docker/Verify-Release-Debian-i386.dockerfile .
+
+  # verify-debian-arm64:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+  #     - name: docker build with version
+  #       run: |
+  #         docker build \
+  #         --build-arg PACKAGE=${{ inputs.packageName }} \
+  #         --build-arg VERSION=${{ inputs.version }} \
+  #         --build-arg TARGETARCH=arm64 \
+  #         -f ./build-support/docker/Verify-Release-Debian.dockerfile .
+
+  # verify-ubuntu-arm64:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+  #     - name: docker build with version
+  #       run: |
+  #         docker build \
+  #         --build-arg PACKAGE=${{ inputs.packageName }} \
+  #         --build-arg VERSION=${{ inputs.version }} \
+  #         --build-arg TARGETARCH=arm64 \
+  #         -f ./build-support/docker/Verify-Release-Ubuntu.dockerfile .
 
+# RPM
   verify-fedora:
     runs-on: ubuntu-latest
     steps:
diff --git a/build-support/docker/Verify-Release-Ubunt-i386.dockerfile b/build-support/docker/Verify-Release-Ubunt-i386.dockerfile
new file mode 100644
index 000000000000..82913b4f7261
--- /dev/null
+++ b/build-support/docker/Verify-Release-Ubunt-i386.dockerfile
@@ -0,0 +1,12 @@
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: MPL-2.0
+
+FROM i386/ubuntu:latest
+RUN apt update && apt install -y software-properties-common curl
+RUN curl -fsSL https://apt.releases.hashicorp.com/gpg | apt-key add -
+ARG TARGETARCH=amd64
+RUN apt-add-repository "deb [arch=${TARGETARCH}] https://apt.releases.hashicorp.com $(lsb_release -cs) main"
+ARG PACKAGE=consul \
+ARG VERSION \
+ARG SUFFIX=1
+RUN apt-get update && apt-get install -y ${PACKAGE}=${VERSION}-${SUFFIX}

From b31b2882ad93c004e0a3f2580d83a399c94e893d Mon Sep 17 00:00:00 2001
From: John Murret <john.murret@hashicorp.com>
Date: Mon, 26 Jun 2023 22:04:57 -0600
Subject: [PATCH 10/14] fix comment lines

---
 .github/workflows/verify-release-linux.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/verify-release-linux.yaml b/.github/workflows/verify-release-linux.yaml
index b41272390faf..01ee7d0a1f90 100644
--- a/.github/workflows/verify-release-linux.yaml
+++ b/.github/workflows/verify-release-linux.yaml
@@ -20,7 +20,7 @@ on:
         type: string
 
 jobs:
-# DEBIAN / AMD64
+  # DEBIAN / AMD64
   verify-ubuntu-amd64:
     runs-on: ubuntu-latest
     steps:
@@ -45,7 +45,7 @@ jobs:
           --build-arg TARGETARCH=amd64 \
           -f ./build-support/docker/Verify-Release-Debian.dockerfile .
             
-# DEBIAN / i386
+  # DEBIAN / i386
   verify-ubuntu-i386:
     runs-on: ubuntu-latest
     steps:
@@ -94,7 +94,7 @@ jobs:
   #         --build-arg TARGETARCH=arm64 \
   #         -f ./build-support/docker/Verify-Release-Ubuntu.dockerfile .
 
-# RPM
+  # RPM
   verify-fedora:
     runs-on: ubuntu-latest
     steps:

From fb686ed8d6ad5294d6069d0799612fc3dccd36e3 Mon Sep 17 00:00:00 2001
From: John Murret <john.murret@hashicorp.com>
Date: Mon, 26 Jun 2023 22:06:56 -0600
Subject: [PATCH 11/14] working

---
 .github/workflows/verify-release-linux.yaml | 28 +--------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

diff --git a/.github/workflows/verify-release-linux.yaml b/.github/workflows/verify-release-linux.yaml
index 01ee7d0a1f90..724a0191863a 100644
--- a/.github/workflows/verify-release-linux.yaml
+++ b/.github/workflows/verify-release-linux.yaml
@@ -20,7 +20,6 @@ on:
         type: string
 
 jobs:
-  # DEBIAN / AMD64
   verify-ubuntu-amd64:
     runs-on: ubuntu-latest
     steps:
@@ -44,31 +43,6 @@ jobs:
           --build-arg VERSION=${{ inputs.version }} \
           --build-arg TARGETARCH=amd64 \
           -f ./build-support/docker/Verify-Release-Debian.dockerfile .
-            
-  # DEBIAN / i386
-  verify-ubuntu-i386:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
-      - name: docker build with version
-        run: |
-          docker build \
-          --build-arg PACKAGE=${{ inputs.packageName }} \
-          --build-arg VERSION=${{ inputs.version }} \
-          --build-arg TARGETARCH=amd64 \
-          -f ./build-support/docker/Verify-Release-Debian.dockerfile .
-  
-  verify-debian-i386:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
-      - name: docker build with version
-        run: |
-          docker build \
-          --build-arg PACKAGE=${{ inputs.packageName }} \
-          --build-arg VERSION=${{ inputs.version }} \
-          --build-arg TARGETARCH=i386 \
-          -f ./build-support/docker/Verify-Release-Debian-i386.dockerfile .
 
   # verify-debian-arm64:
   #   runs-on: ubuntu-latest
@@ -94,7 +68,7 @@ jobs:
   #         --build-arg TARGETARCH=arm64 \
   #         -f ./build-support/docker/Verify-Release-Ubuntu.dockerfile .
 
-  # RPM
+
   verify-fedora:
     runs-on: ubuntu-latest
     steps:

From a02980d16d9d95a678447be32277c0cf0f43e600 Mon Sep 17 00:00:00 2001
From: John Murret <john.murret@hashicorp.com>
Date: Tue, 27 Jun 2023 15:48:00 -0600
Subject: [PATCH 12/14] remove commented out workflow jobs

---
 .github/workflows/verify-release-linux.yaml | 25 ---------------------
 1 file changed, 25 deletions(-)

diff --git a/.github/workflows/verify-release-linux.yaml b/.github/workflows/verify-release-linux.yaml
index 724a0191863a..a86da7f05fb3 100644
--- a/.github/workflows/verify-release-linux.yaml
+++ b/.github/workflows/verify-release-linux.yaml
@@ -44,31 +44,6 @@ jobs:
           --build-arg TARGETARCH=amd64 \
           -f ./build-support/docker/Verify-Release-Debian.dockerfile .
 
-  # verify-debian-arm64:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
-  #     - name: docker build with version
-  #       run: |
-  #         docker build \
-  #         --build-arg PACKAGE=${{ inputs.packageName }} \
-  #         --build-arg VERSION=${{ inputs.version }} \
-  #         --build-arg TARGETARCH=arm64 \
-  #         -f ./build-support/docker/Verify-Release-Debian.dockerfile .
-
-  # verify-ubuntu-arm64:
-  #   runs-on: ubuntu-latest
-  #   steps:
-  #     - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
-  #     - name: docker build with version
-  #       run: |
-  #         docker build \
-  #         --build-arg PACKAGE=${{ inputs.packageName }} \
-  #         --build-arg VERSION=${{ inputs.version }} \
-  #         --build-arg TARGETARCH=arm64 \
-  #         -f ./build-support/docker/Verify-Release-Ubuntu.dockerfile .
-
-
   verify-fedora:
     runs-on: ubuntu-latest
     steps:

From 230e31f641a6a2468b6e8741989d5549245b168c Mon Sep 17 00:00:00 2001
From: John Murret <john.murret@hashicorp.com>
Date: Tue, 27 Jun 2023 15:51:44 -0600
Subject: [PATCH 13/14] Apply suggestions from code review

Co-authored-by: Nathan Coleman <nathan.coleman@hashicorp.com>
---
 build-support/docker/Verify-Release-Amazon.dockerfile | 1 -
 build-support/docker/Verify-Release-CentOS.dockerfile | 1 -
 2 files changed, 2 deletions(-)

diff --git a/build-support/docker/Verify-Release-Amazon.dockerfile b/build-support/docker/Verify-Release-Amazon.dockerfile
index 6265668ebf68..5242ba0954d1 100644
--- a/build-support/docker/Verify-Release-Amazon.dockerfile
+++ b/build-support/docker/Verify-Release-Amazon.dockerfile
@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: MPL-2.0
 
 FROM amazonlinux:latest
-
 RUN yum install -y yum-utils shadow-utils
 RUN yum-config-manager --add-repo https://rpm.releases.hashicorp.com/AmazonLinux/hashicorp.repo
 ARG PACKAGE=consul \
diff --git a/build-support/docker/Verify-Release-CentOS.dockerfile b/build-support/docker/Verify-Release-CentOS.dockerfile
index c83341ccb76a..a2be67ac776f 100644
--- a/build-support/docker/Verify-Release-CentOS.dockerfile
+++ b/build-support/docker/Verify-Release-CentOS.dockerfile
@@ -1,7 +1,6 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: MPL-2.0
 
-
 FROM centos:7
 RUN yum install -y yum-utils
 RUN yum-config-manager --add-repo https://rpm.releases.hashicorp.com/RHEL/hashicorp.repo

From 5b8d47207c9ed07f76ae4344a6f83321e11708a3 Mon Sep 17 00:00:00 2001
From: John Murret <john.murret@hashicorp.com>
Date: Tue, 27 Jun 2023 15:52:09 -0600
Subject: [PATCH 14/14] update fedora and ubuntu to use latest tag

---
 build-support/docker/Verify-Release-Amazon.dockerfile | 2 +-
 build-support/docker/Verify-Release-Fedora.dockerfile | 4 ++--
 build-support/docker/Verify-Release-Ubuntu.dockerfile | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build-support/docker/Verify-Release-Amazon.dockerfile b/build-support/docker/Verify-Release-Amazon.dockerfile
index 5242ba0954d1..591b234c3b7c 100644
--- a/build-support/docker/Verify-Release-Amazon.dockerfile
+++ b/build-support/docker/Verify-Release-Amazon.dockerfile
@@ -7,4 +7,4 @@ RUN yum-config-manager --add-repo https://rpm.releases.hashicorp.com/AmazonLinux
 ARG PACKAGE=consul \
 ARG VERSION \
 ARG SUFFIX=1
-RUN yum install -y ${PACKAGE}-${VERSION}-${SUFFIX}
\ No newline at end of file
+RUN yum install -y ${PACKAGE}-${VERSION}-${SUFFIX}
diff --git a/build-support/docker/Verify-Release-Fedora.dockerfile b/build-support/docker/Verify-Release-Fedora.dockerfile
index 8fcdedfda119..601751a91182 100644
--- a/build-support/docker/Verify-Release-Fedora.dockerfile
+++ b/build-support/docker/Verify-Release-Fedora.dockerfile
@@ -1,10 +1,10 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: MPL-2.0
 
-FROM fedora:36
+FROM fedora:latest
 RUN dnf install -y dnf-plugins-core
 RUN dnf config-manager --add-repo https://rpm.releases.hashicorp.com/fedora/hashicorp.repo
 ARG PACKAGE=consul \
 ARG VERSION \
 ARG SUFFIX=1
-RUN dnf install -y ${PACKAGE}-${VERSION}-${SUFFIX}
\ No newline at end of file
+RUN dnf install -y ${PACKAGE}-${VERSION}-${SUFFIX}
diff --git a/build-support/docker/Verify-Release-Ubuntu.dockerfile b/build-support/docker/Verify-Release-Ubuntu.dockerfile
index 5bb7847e25fc..ddeffc40c5f6 100644
--- a/build-support/docker/Verify-Release-Ubuntu.dockerfile
+++ b/build-support/docker/Verify-Release-Ubuntu.dockerfile
@@ -1,7 +1,7 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: MPL-2.0
 
-FROM ubuntu:22.04
+FROM ubuntu:latest
 RUN apt update && apt install -y software-properties-common curl
 RUN curl -fsSL https://apt.releases.hashicorp.com/gpg | apt-key add -
 ARG TARGETARCH=amd64
@@ -9,4 +9,4 @@ RUN apt-add-repository "deb [arch=${TARGETARCH}] https://apt.releases.hashicorp.
 ARG PACKAGE=consul \
 ARG VERSION \
 ARG SUFFIX=1
-RUN apt-get update && apt-get install -y ${PACKAGE}=${VERSION}-${SUFFIX}
\ No newline at end of file
+RUN apt-get update && apt-get install -y ${PACKAGE}=${VERSION}-${SUFFIX}