From fbbb6f99cde319a5ba4e6b187f6e2111d3d601d9 Mon Sep 17 00:00:00 2001
From: Leonid Bugaev <leonsbox@gmail.com>
Date: Tue, 14 Feb 2023 22:56:38 +0300
Subject: [PATCH 1/7] Boring crypto

WIP
---
 .github/workflows/release.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 8f02091..dc3e15d 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -28,6 +28,10 @@ jobs:
             tag: el7
           - gover: "1.15"
             debver: buster
+          - gover: "goboring/golang:1.16.7b7"
+            boringcrypto: true
+            tag: fips
+
 
     runs-on: ubuntu-latest
  

From fe2456dc7808cc7756ea35fe1b5d7f908660e6d7 Mon Sep 17 00:00:00 2001
From: Leonid Bugaev <leonsbox@gmail.com>
Date: Tue, 14 Feb 2023 23:01:58 +0300
Subject: [PATCH 2/7] Update release.yml

---
 .github/workflows/release.yml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index dc3e15d..7327814 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -13,6 +13,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        image:
+          - "golang"
         gover:
           - "1.16"
           - "1.17"
@@ -20,16 +22,17 @@ jobs:
           - "1.19"
           - "1.20"
         debver:
-          - buster
-          - bullseye
+          - "-buster"
+          - "-bullseye"
         include:
           - gover: "1.15"
-            debver: stretch
+            debver: "-stretch"
             tag: el7
           - gover: "1.15"
-            debver: buster
-          - gover: "goboring/golang:1.16.7b7"
-            boringcrypto: true
+            debver: "-buster"
+          - image: "goboring/golang"
+            debver: ""
+            gover: "1.16.7b7"
             tag: fips
 
 

From 337ef194c658d01026115f82d97238ecb47ee88f Mon Sep 17 00:00:00 2001
From: Leonid Bugaev <leonsbox@gmail.com>
Date: Tue, 14 Feb 2023 23:02:31 +0300
Subject: [PATCH 3/7] Update Dockerfile

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index bcfb206..487ab91 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@
 ARG GO_VERSION=1.15.15
 ARG DEB_VERSION=stretch
 
-FROM golang:${GO_VERSION}-${DEB_VERSION} AS base
+FROM golang:${GO_VERSION}${DEB_VERSION} AS base
 
 ARG DEB_VERSION
 ARG DEBIAN_FRONTEND=noninteractive

From c20378f53fcd054789bfea52b65bbaa24c8aae4e Mon Sep 17 00:00:00 2001
From: Leonid Bugaev <leonsbox@gmail.com>
Date: Tue, 14 Feb 2023 23:03:32 +0300
Subject: [PATCH 4/7] Update Dockerfile

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 487ab91..7f77f6a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,8 +2,9 @@
 
 ARG GO_VERSION=1.15.15
 ARG DEB_VERSION=stretch
+ARG GO_IMAGE=google/go
 
-FROM golang:${GO_VERSION}${DEB_VERSION} AS base
+FROM {GO_IMAGE}:${GO_VERSION}${DEB_VERSION} AS base
 
 ARG DEB_VERSION
 ARG DEBIAN_FRONTEND=noninteractive

From e231cce6657d4b44c3bc4e308bba51e6e3931af7 Mon Sep 17 00:00:00 2001
From: Leonid Bugaev <leonsbox@gmail.com>
Date: Tue, 14 Feb 2023 23:04:32 +0300
Subject: [PATCH 5/7] Update release.yml

---
 .github/workflows/release.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 7327814..37c375c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -58,3 +58,4 @@ jobs:
         build-args: |
           GO_VERSION=${{ matrix.gover }}
           DEB_VERSION=${{ matrix.debver }}
+          GO_IMAGE=${{ matrix.image }}

From 5b0735212211c62b7a014a20caf69e4e150d75bb Mon Sep 17 00:00:00 2001
From: Leonid Bugaev <leonsbox@gmail.com>
Date: Wed, 15 Feb 2023 09:38:52 +0300
Subject: [PATCH 6/7] Update Dockerfile

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7f77f6a..22b3c02 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,9 +2,9 @@
 
 ARG GO_VERSION=1.15.15
 ARG DEB_VERSION=stretch
-ARG GO_IMAGE=google/go
+ARG GO_IMAGE=golang
 
-FROM {GO_IMAGE}:${GO_VERSION}${DEB_VERSION} AS base
+FROM ${GO_IMAGE}:${GO_VERSION}${DEB_VERSION} AS base
 
 ARG DEB_VERSION
 ARG DEBIAN_FRONTEND=noninteractive

From f5d0cc179cdc41e7762c02a3d695a48a037740b6 Mon Sep 17 00:00:00 2001
From: Leonid Bugaev <leonsbox@gmail.com>
Date: Wed, 15 Feb 2023 09:41:23 +0300
Subject: [PATCH 7/7] Update release.yml

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

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 37c375c..6f4e3ee 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,9 +27,11 @@ jobs:
         include:
           - gover: "1.15"
             debver: "-stretch"
+            image: "golang"
             tag: el7
           - gover: "1.15"
             debver: "-buster"
+            image: "golang"
           - image: "goboring/golang"
             debver: ""
             gover: "1.16.7b7"