Merge pull request #27 from microsoft/dev/qmuntal/mariner2sudo

Install sudo and Mariner 2 and remove FIPS variant
microsoft · Oct 26, 2024 · b9c607a · b9c607a
2 parents 02e8663 + dcdbc49
commit b9c607a
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 52 deletions.
diff --git a/images.md b/images.md
@@ -18,21 +18,11 @@ mcr.microsoft.com/microsoft-go/infra-images:azurelinux-3.0-amd64-default
 mcr.microsoft.com/microsoft-go/infra-images:cbl-mariner-2.0-amd64-default
 ```
 
-`cbl-mariner-2.0-amd64-fips` ([src/cbl-mariner/2.0/amd64/fips](./src/cbl-mariner/2.0/amd64/fips/Dockerfile))
-```
-mcr.microsoft.com/microsoft-go/infra-images:cbl-mariner-2.0-amd64-fips
-```
-
 `cbl-mariner-2.0-arm64-default` ([src/cbl-mariner/2.0/arm64/default](./src/cbl-mariner/2.0/arm64/default/Dockerfile))
 ```
 mcr.microsoft.com/microsoft-go/infra-images:cbl-mariner-2.0-arm64-default
 ```
 
-`cbl-mariner-2.0-arm64-fips` ([src/cbl-mariner/2.0/arm64/fips](./src/cbl-mariner/2.0/arm64/fips/Dockerfile))
-```
-mcr.microsoft.com/microsoft-go/infra-images:cbl-mariner-2.0-arm64-fips
-```
-
 `ubuntu-20.04-amd64-default` ([src/ubuntu/20.04/amd64/default](./src/ubuntu/20.04/amd64/default/Dockerfile))
 ```
 mcr.microsoft.com/microsoft-go/infra-images:ubuntu-20.04-amd64-default

diff --git a/manifest.json b/manifest.json
@@ -42,22 +42,6 @@
             }
           ]
         },
-        {
-          "productVersion": "",
-          "sharedTags": {},
-          "platforms": [
-            {
-              "architecture": "amd64",
-              "dockerfile": "src/cbl-mariner/2.0/amd64/fips",
-              "os": "linux",
-              "osVersion": "2.0",
-              "tags": {
-                "cbl-mariner-2.0-amd64-fips": {},
-                "cbl-mariner-2.0-amd64-fips-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {}
-              }
-            }
-          ]
-        },
         {
           "productVersion": "",
           "sharedTags": {},
@@ -74,22 +58,6 @@
             }
           ]
         },
-        {
-          "productVersion": "",
-          "sharedTags": {},
-          "platforms": [
-            {
-              "architecture": "arm64",
-              "dockerfile": "src/cbl-mariner/2.0/arm64/fips",
-              "os": "linux",
-              "osVersion": "2.0",
-              "tags": {
-                "cbl-mariner-2.0-arm64-fips": {},
-                "cbl-mariner-2.0-arm64-fips-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {}
-              }
-            }
-          ]
-        },
         {
           "productVersion": "",
           "sharedTags": {},

diff --git a/src/cbl-mariner/2.0/amd64/default/Dockerfile b/src/cbl-mariner/2.0/amd64/default/Dockerfile
@@ -14,7 +14,7 @@ RUN set -eux; \
         iana-etc \
         kernel-headers \
         mercurial \
-        openssl-devel \
         powershell \
+        sudo \
     ; \
     tdnf clean all
diff --git a/src/cbl-mariner/2.0/amd64/fips/Dockerfile b/src/cbl-mariner/2.0/amd64/fips/Dockerfile
diff --git a/src/cbl-mariner/2.0/arm64/default/Dockerfile b/src/cbl-mariner/2.0/arm64/default/Dockerfile
@@ -14,7 +14,7 @@ RUN set -eux; \
         iana-etc \
         kernel-headers \
         mercurial \
-        openssl-devel \
         powershell \
+        sudo \
     ; \
     tdnf clean all
diff --git a/src/cbl-mariner/2.0/arm64/fips/Dockerfile b/src/cbl-mariner/2.0/arm64/fips/Dockerfile