From e4f21d8183b9f61f7fe129a1d5e95c6e7aabb8d0 Mon Sep 17 00:00:00 2001
From: David Beckingsale <davidbeckingsale@gmail.com>
Date: Tue, 14 Sep 2021 04:30:40 -0700
Subject: [PATCH 1/6] Add GCC image

---
 ubuntu/gcc/Dockerfile    |  8 ++++++++
 ubuntu/gcc/uptodate.yaml | 20 ++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 ubuntu/gcc/Dockerfile
 create mode 100644 ubuntu/gcc/uptodate.yaml

diff --git a/ubuntu/gcc/Dockerfile b/ubuntu/gcc/Dockerfile
new file mode 100644
index 0000000000..2089d2ecd4
--- /dev/null
+++ b/ubuntu/gcc/Dockerfile
@@ -0,0 +1,8 @@
+ARG ubuntu_version
+FROM ghcr.io/rse-radiuss/ubuntu:$ubuntu_version
+
+# Install gcc with spack
+ARG gcc_version
+ENV gcc_version=$gcc_version
+
+RUN spack install gcc@${gcc_version}
diff --git a/ubuntu/gcc/uptodate.yaml b/ubuntu/gcc/uptodate.yaml
new file mode 100644
index 0000000000..be9e449ae6
--- /dev/null
+++ b/ubuntu/gcc/uptodate.yaml
@@ -0,0 +1,20 @@
+dockerbuild:
+  build_args:
+    gcc_version:
+      key: gcc
+      versions:
+       - "4.9.3"
+       _ "7.3.0"
+       _ "8.1.0"
+       _ "9.4.0"
+       _ "10.3.0"
+       _ "11.2.0"
+
+    # Look for ubuntu versions for our base builds
+    ubuntu_version:
+      key: ubuntu
+      name: ghcr.io/rse-radiuss/ubuntu
+      type: container
+      startat: "20.04"
+      filter: 
+        - "^[0-9]+[.]04$"

From 9a588497411cf2649d93468c8cf8150e36783231 Mon Sep 17 00:00:00 2001
From: David Beckingsale <davidbeckingsale@gmail.com>
Date: Tue, 14 Sep 2021 05:39:52 -0700
Subject: [PATCH 2/6] Fixup yaml syntax

---
 ubuntu/gcc/uptodate.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ubuntu/gcc/uptodate.yaml b/ubuntu/gcc/uptodate.yaml
index be9e449ae6..259baa2d0e 100644
--- a/ubuntu/gcc/uptodate.yaml
+++ b/ubuntu/gcc/uptodate.yaml
@@ -4,7 +4,7 @@ dockerbuild:
       key: gcc
       versions:
        - "4.9.3"
-       _ "7.3.0"
+       - "7.3.0"
        _ "8.1.0"
        _ "9.4.0"
        _ "10.3.0"

From 7b4a588e6b85eb53e517e86fb4b58c0d7fd15917 Mon Sep 17 00:00:00 2001
From: vsoch <vsoch@users.noreply.github.com>
Date: Tue, 14 Sep 2021 10:34:53 -0600
Subject: [PATCH 3/6] update PR with librarian, also test changing to false
 instead of "false"

Signed-off-by: vsoch <vsoch@users.noreply.github.com>
---
 .github/workflows/dockerfiles.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dockerfiles.yaml b/.github/workflows/dockerfiles.yaml
index d33e8696de..81db5c95d6 100644
--- a/.github/workflows/dockerfiles.yaml
+++ b/.github/workflows/dockerfiles.yaml
@@ -116,7 +116,7 @@ jobs:
       fail-fast: false
       matrix:
         result: ${{ fromJson(needs.update.outputs.dockerfile_matrix) }}
-    if: ${{ needs.update.outputs.empty_matrix == 'false' }}
+    if: ${{ needs.update.outputs.empty_matrix == false }}
 
     name: "Build ${{ matrix.result.name }}"
     steps:

From 0976c2b8bb5864fd90bb8d54d42db7f762fa336c Mon Sep 17 00:00:00 2001
From: vsoch <vsoch@users.noreply.github.com>
Date: Tue, 14 Sep 2021 10:37:40 -0600
Subject: [PATCH 4/6] fixing bug with dockerfiles - empty matrix

Signed-off-by: vsoch <vsoch@users.noreply.github.com>
---
 .github/workflows/dockerfiles.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/dockerfiles.yaml b/.github/workflows/dockerfiles.yaml
index 81db5c95d6..af9c8de21c 100644
--- a/.github/workflows/dockerfiles.yaml
+++ b/.github/workflows/dockerfiles.yaml
@@ -100,7 +100,7 @@ jobs:
           result: ${{ steps.dockerfile_list.outputs.dockerfilelist_matrix }}
         run: |
           echo ${result}
-          if [[ "${result}" == "" ]]; then
+          if [[ "${result}" == "[]" ]]; then
             printf "The matrix is empty, will not trigger next workflow.\n"
             echo "::set-output name=empty_matrix::true"       
           else

From 08851ee3dc91e50f30b4ab97ea5ecbd6dc519c40 Mon Sep 17 00:00:00 2001
From: vsoch <vsoch@users.noreply.github.com>
Date: Tue, 14 Sep 2021 10:44:50 -0600
Subject: [PATCH 5/6] yaml bug

Signed-off-by: vsoch <vsoch@users.noreply.github.com>
---
 ubuntu/gcc/uptodate.yaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ubuntu/gcc/uptodate.yaml b/ubuntu/gcc/uptodate.yaml
index 259baa2d0e..8d86767929 100644
--- a/ubuntu/gcc/uptodate.yaml
+++ b/ubuntu/gcc/uptodate.yaml
@@ -5,10 +5,10 @@ dockerbuild:
       versions:
        - "4.9.3"
        - "7.3.0"
-       _ "8.1.0"
-       _ "9.4.0"
-       _ "10.3.0"
-       _ "11.2.0"
+       - "8.1.0"
+       - "9.4.0"
+       - "10.3.0"
+       - "11.2.0"
 
     # Look for ubuntu versions for our base builds
     ubuntu_version:

From f0840ca604428aa8b4a7c4c4a581326651daed11 Mon Sep 17 00:00:00 2001
From: vsoch <vsoch@users.noreply.github.com>
Date: Tue, 14 Sep 2021 12:45:21 -0600
Subject: [PATCH 6/6] remove broken version for now

Signed-off-by: vsoch <vsoch@users.noreply.github.com>
---
 ubuntu/gcc/uptodate.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ubuntu/gcc/uptodate.yaml b/ubuntu/gcc/uptodate.yaml
index 8d86767929..7dc5a724e4 100644
--- a/ubuntu/gcc/uptodate.yaml
+++ b/ubuntu/gcc/uptodate.yaml
@@ -3,7 +3,8 @@ dockerbuild:
     gcc_version:
       key: gcc
       versions:
-       - "4.9.3"
+       # Needs patch from spack https://github.com/spack/spack/pull/25945
+       # - "4.9.3"
        - "7.3.0"
        - "8.1.0"
        - "9.4.0"