Apply stash

Signed-off-by: Keith Mattix II <keithmattix2@gmail.com>
openservicemesh · Aug 9, 2022 · 0bf9e6b · 0bf9e6b
1 parent 9587607
commit 0bf9e6b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -11,7 +11,6 @@
 
 	// Update the 'dockerFile' property if you aren't using the standard 'Dockerfile' filename.
 	"dockerFile": "../Dockerfile",
-	// "dockerFile": "../Dockerfile.fips",
 
 	//"workspaceMount":"source=${localWorkspaceFolder},target=/go/src/github.com/openservicemesh/osm,type=bind,consistency=cached",
 

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -116,7 +116,7 @@ jobs:
     name: Go build (FIPS)
     runs-on: ubuntu-latest
     container:
-      image: mcr.microsoft.com/oss/go/microsoft/golang:1.17-fips-cbl-mariner2.0
+      image: mcr.microsoft.com/oss/go/microsoft/golang:1.19-fips-cbl-mariner2.0
       env:
         FIPS: 1
         GNUPGHOME: /root/.gnupg
@@ -165,7 +165,7 @@ jobs:
     name: Go test (FIPS)
     runs-on: ubuntu-latest
     container:
-      image: mcr.microsoft.com/oss/go/microsoft/golang:1.17-fips-cbl-mariner2.0
+      image: mcr.microsoft.com/oss/go/microsoft/golang:1.19-fips-cbl-mariner2.0
       env:
         GNUPGHOME: /root/.gnupg
         GOFIPS: 1

diff --git a/Dockerfile.fips b/Dockerfile.fips
@@ -1,6 +1,6 @@
 
 #build stage
-FROM mcr.microsoft.com/oss/go/microsoft/golang:1.17-fips-cbl-mariner2.0 AS builder
+FROM mcr.microsoft.com/oss/go/microsoft/golang:1.19-fips-cbl-mariner2.0 AS builder
 
 RUN yum update -y
 RUN yum install -y make git gcc gcc-c++ glibc-devel openssl-devel bash ca-certificates