Get centos:7 images updated (#1010)

dotnet · Apr 19, 2024 · d37b4d6 · d37b4d6
1 parent ed08b89
commit d37b4d6
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 44 deletions.
diff --git a/eng/pipelines/dotnet-buildtools-prereqs-centos.yml b/eng/pipelines/dotnet-buildtools-prereqs-centos.yml
@@ -7,6 +7,14 @@ trigger:
     - src/centos/*
 pr: none
 
+schedules:
+- cron: "0 5 * * 1"
+  displayName: Weekly build
+  branches:
+    include:
+    - main
+  always: true
+
 resources:
   repositories:
   - repository: 1ESPipelineTemplates

diff --git a/src/centos/7/Dockerfile b/src/centos/7/Dockerfile
@@ -2,7 +2,11 @@ FROM centos:7
 
 # Install dependencies
 
-RUN yum install -y \
+RUN \
+    # Since the base image isn't actively maintained, force an upgrade of existing packages
+    yum update -y \
+    && \
+    yum install -y \
         centos-release-scl \
         epel-release \
         scl-utils-build \

diff --git a/src/centos/7/rpmpkg/Dockerfile b/src/centos/7/rpmpkg/Dockerfile
diff --git a/src/centos/7/rpmpkg/scl_enable b/src/centos/7/rpmpkg/scl_enable
diff --git a/src/centos/7/source-build/amd64/Dockerfile b/src/centos/7/source-build/amd64/Dockerfile
@@ -2,7 +2,11 @@ FROM centos:7
 
 # Install dependencies
 
-RUN yum install -y \
+RUN \
+    # Since the base image isn't actively maintained, force an upgrade of existing packages
+    yum update -y \
+    && \
+    yum install -y \
         centos-release-scl \
         epel-release \
         scl-utils-build \

diff --git a/src/centos/manifest.json b/src/centos/manifest.json
@@ -48,19 +48,6 @@
             }
           ]
         },
-        {
-          "platforms": [
-            {
-              "dockerfile": "src/centos/7/rpmpkg",
-              "os": "linux",
-              "osVersion": "centos7",
-              "tags": {
-                "centos-7-rpmpkg-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
-                "centos-7-rpmpkg$(FloatingTagSuffix)": {}
-              }
-            }
-          ]
-        },
         {
           "platforms": [
             {