From aecbbd97fe4a6a7d34bf7ecc414add05c3f3167a Mon Sep 17 00:00:00 2001
From: Kevin Carter <kevin.carter@figment.io>
Date: Mon, 24 Apr 2023 11:49:20 -0500
Subject: [PATCH] Update go versions and create a 1.18 build tree

Signed-off-by: Kevin Carter <kevin.carter@figment.io>
---
 base-go1.18/Dockerfile | 53 ++++++++++++++++++++++++++++++++++++++++++
 base-go1.18/README.md  |  1 +
 base-go1.18/TARGETS    |  3 +++
 base-go1.18/VERSION    |  1 +
 base-go1.19/Dockerfile |  6 ++---
 base-go1.19/VERSION    |  2 +-
 base-go1.20/Dockerfile |  6 ++---
 base-go1.20/VERSION    |  2 +-
 8 files changed, 66 insertions(+), 8 deletions(-)
 create mode 100644 base-go1.18/Dockerfile
 create mode 100644 base-go1.18/README.md
 create mode 100644 base-go1.18/TARGETS
 create mode 100644 base-go1.18/VERSION

diff --git a/base-go1.18/Dockerfile b/base-go1.18/Dockerfile
new file mode 100644
index 00000000..02845082
--- /dev/null
+++ b/base-go1.18/Dockerfile
@@ -0,0 +1,53 @@
+FROM ghcr.io/oshied/base-build:bionic as bionic
+ARG name="base-go1.18"
+ARG summary="Base build image for go 1.18.x built on-top of ubuntu Bionic"
+LABEL description="${summary}" \
+      maintainer="cloudnull.io <kevin@cloudnull.com>" \
+      app.kubernetes.io/name="${name}" \
+      org.opencontainers.image.title="${name}" \
+      org.opencontainers.artifact.description="${summary}" \
+      org.opencontainers.image.url="https://github.com/oshied/protocol-forge" \
+      org.opencontainers.image.authors="kevin@cloudnull.com" \
+      org.opencontainers.image.vendor="cloudnull.io" \
+      org.opencontainers.image.description="${summary}"
+ARG GO_URL=https://go.dev/dl/go1.18.10.linux-amd64.tar.gz
+RUN rm -rf /usr/local/go
+RUN curl -L "$GO_URL" -o /tmp/go-linux-amd64.tar.gz
+RUN tar -C /usr/local -xzf /tmp/go-linux-amd64.tar.gz
+ENV PATH="$PATH:/usr/local/go/bin"
+
+FROM ghcr.io/oshied/base-build:focal as focal
+ARG name="base-go1.18"
+ARG summary="Base build image for go 1.18.x built on-top of ubuntu Focal"
+LABEL description="${summary}" \
+      maintainer="cloudnull.io <kevin@cloudnull.com>" \
+      app.kubernetes.io/name="${name}" \
+      org.opencontainers.image.title="${name}" \
+      org.opencontainers.artifact.description="${summary}" \
+      org.opencontainers.image.url="https://github.com/oshied/protocol-forge" \
+      org.opencontainers.image.authors="kevin@cloudnull.com" \
+      org.opencontainers.image.vendor="cloudnull.io" \
+      org.opencontainers.image.description="${summary}"
+ARG GO_URL=https://go.dev/dl/go1.18.10.linux-amd64.tar.gz
+RUN rm -rf /usr/local/go
+RUN curl -L "$GO_URL" -o /tmp/go-linux-amd64.tar.gz
+RUN tar -C /usr/local -xzf /tmp/go-linux-amd64.tar.gz
+ENV PATH="$PATH:/usr/local/go/bin"
+
+FROM ghcr.io/oshied/base-build:jammy as jammy
+ARG name="base-go1.18"
+ARG summary="Base build image for go 1.18.x built on-top of ubuntu Jammy"
+LABEL description="${summary}" \
+      maintainer="cloudnull.io <kevin@cloudnull.com>" \
+      app.kubernetes.io/name="${name}" \
+      org.opencontainers.image.title="${name}" \
+      org.opencontainers.artifact.description="${summary}" \
+      org.opencontainers.image.url="https://github.com/oshied/protocol-forge" \
+      org.opencontainers.image.authors="kevin@cloudnull.com" \
+      org.opencontainers.image.vendor="cloudnull.io" \
+      org.opencontainers.image.description="${summary}"
+ARG GO_URL=https://go.dev/dl/go1.18.10.linux-amd64.tar.gz
+RUN rm -rf /usr/local/go
+RUN curl -L "$GO_URL" -o /tmp/go-linux-amd64.tar.gz
+RUN tar -C /usr/local -xzf /tmp/go-linux-amd64.tar.gz
+ENV PATH="$PATH:/usr/local/go/bin"
diff --git a/base-go1.18/README.md b/base-go1.18/README.md
new file mode 100644
index 00000000..080ea3ae
--- /dev/null
+++ b/base-go1.18/README.md
@@ -0,0 +1 @@
+# Base container for go lang 1.18
diff --git a/base-go1.18/TARGETS b/base-go1.18/TARGETS
new file mode 100644
index 00000000..78102351
--- /dev/null
+++ b/base-go1.18/TARGETS
@@ -0,0 +1,3 @@
+bionic
+focal
+jammy
diff --git a/base-go1.18/VERSION b/base-go1.18/VERSION
new file mode 100644
index 00000000..03483b34
--- /dev/null
+++ b/base-go1.18/VERSION
@@ -0,0 +1 @@
+1.18.10
\ No newline at end of file
diff --git a/base-go1.19/Dockerfile b/base-go1.19/Dockerfile
index 0d969eb5..c9d4a2e0 100644
--- a/base-go1.19/Dockerfile
+++ b/base-go1.19/Dockerfile
@@ -10,7 +10,7 @@ LABEL description="${summary}" \
       org.opencontainers.image.authors="kevin@cloudnull.com" \
       org.opencontainers.image.vendor="cloudnull.io" \
       org.opencontainers.image.description="${summary}"
-ARG GO_URL=https://go.dev/dl/go1.19.7.linux-amd64.tar.gz
+ARG GO_URL=https://go.dev/dl/go1.19.8.linux-amd64.tar.gz
 RUN rm -rf /usr/local/go
 RUN curl -L "$GO_URL" -o /tmp/go-linux-amd64.tar.gz
 RUN tar -C /usr/local -xzf /tmp/go-linux-amd64.tar.gz
@@ -28,7 +28,7 @@ LABEL description="${summary}" \
       org.opencontainers.image.authors="kevin@cloudnull.com" \
       org.opencontainers.image.vendor="cloudnull.io" \
       org.opencontainers.image.description="${summary}"
-ARG GO_URL=https://go.dev/dl/go1.19.7.linux-amd64.tar.gz
+ARG GO_URL=https://go.dev/dl/go1.19.8.linux-amd64.tar.gz
 RUN rm -rf /usr/local/go
 RUN curl -L "$GO_URL" -o /tmp/go-linux-amd64.tar.gz
 RUN tar -C /usr/local -xzf /tmp/go-linux-amd64.tar.gz
@@ -46,7 +46,7 @@ LABEL description="${summary}" \
       org.opencontainers.image.authors="kevin@cloudnull.com" \
       org.opencontainers.image.vendor="cloudnull.io" \
       org.opencontainers.image.description="${summary}"
-ARG GO_URL=https://go.dev/dl/go1.19.7.linux-amd64.tar.gz
+ARG GO_URL=https://go.dev/dl/go1.19.8.linux-amd64.tar.gz
 RUN rm -rf /usr/local/go
 RUN curl -L "$GO_URL" -o /tmp/go-linux-amd64.tar.gz
 RUN tar -C /usr/local -xzf /tmp/go-linux-amd64.tar.gz
diff --git a/base-go1.19/VERSION b/base-go1.19/VERSION
index d76b365b..1539c049 100644
--- a/base-go1.19/VERSION
+++ b/base-go1.19/VERSION
@@ -1 +1 @@
-1.19.7
\ No newline at end of file
+1.19.8
\ No newline at end of file
diff --git a/base-go1.20/Dockerfile b/base-go1.20/Dockerfile
index e62610a0..abb12e1f 100644
--- a/base-go1.20/Dockerfile
+++ b/base-go1.20/Dockerfile
@@ -10,7 +10,7 @@ LABEL description="${summary}" \
       org.opencontainers.image.authors="kevin@cloudnull.com" \
       org.opencontainers.image.vendor="cloudnull.io" \
       org.opencontainers.image.description="${summary}"
-ARG GO_URL=https://go.dev/dl/go1.20.2.linux-amd64.tar.gz
+ARG GO_URL=https://go.dev/dl/go1.20.3.linux-amd64.tar.gz
 RUN rm -rf /usr/local/go
 RUN curl -L "$GO_URL" -o /tmp/go-linux-amd64.tar.gz
 RUN tar -C /usr/local -xzf /tmp/go-linux-amd64.tar.gz
@@ -28,7 +28,7 @@ LABEL description="${summary}" \
       org.opencontainers.image.authors="kevin@cloudnull.com" \
       org.opencontainers.image.vendor="cloudnull.io" \
       org.opencontainers.image.description="${summary}"
-ARG GO_URL=https://go.dev/dl/go1.20.2.linux-amd64.tar.gz
+ARG GO_URL=https://go.dev/dl/go1.20.3.linux-amd64.tar.gz
 RUN rm -rf /usr/local/go
 RUN curl -L "$GO_URL" -o /tmp/go-linux-amd64.tar.gz
 RUN tar -C /usr/local -xzf /tmp/go-linux-amd64.tar.gz
@@ -46,7 +46,7 @@ LABEL description="${summary}" \
       org.opencontainers.image.authors="kevin@cloudnull.com" \
       org.opencontainers.image.vendor="cloudnull.io" \
       org.opencontainers.image.description="${summary}"
-ARG GO_URL=https://go.dev/dl/go1.20.2.linux-amd64.tar.gz
+ARG GO_URL=https://go.dev/dl/go1.20.3.linux-amd64.tar.gz
 RUN rm -rf /usr/local/go
 RUN curl -L "$GO_URL" -o /tmp/go-linux-amd64.tar.gz
 RUN tar -C /usr/local -xzf /tmp/go-linux-amd64.tar.gz
diff --git a/base-go1.20/VERSION b/base-go1.20/VERSION
index 341e509f..3cb1511d 100644
--- a/base-go1.20/VERSION
+++ b/base-go1.20/VERSION
@@ -1 +1 @@
-1.20.2
\ No newline at end of file
+1.20.3
\ No newline at end of file