Remove centos7

centos7 is EOL and is no longer buildable, as such it should be removed.
Azure · Jul 16, 2024 · c8bb597 · c8bb597
1 parent e5c1b84
commit c8bb597
Show file tree

Hide file tree

Showing 16 changed files with 0 additions and 165 deletions.
diff --git a/packages/moby-buildx/mapping.go b/packages/moby-buildx/mapping.go
@@ -9,7 +9,6 @@ var (
  "bullseye": DebArchive,
  "bionic": DebArchive,
  "focal": DebArchive,
- "centos7": RPMArchive,
  "rhel8": RPMArchive,
  "rhel9": RPMArchive,
  "windows": BaseArchive,

diff --git a/packages/moby-cli/mapping.go b/packages/moby-cli/mapping.go
@@ -21,7 +21,6 @@ var (
  "bullseye": DebArchive,
  "bionic": DebArchive,
  "focal": DebArchive,
- "centos7": RPMArchive,
  "rhel8": RPMArchive,
  "rhel9": RPMArchive,
  "windows": BaseArchive,

diff --git a/packages/moby-compose/mapping.go b/packages/moby-compose/mapping.go
@@ -9,7 +9,6 @@ var (
  "bullseye": DebArchive,
  "bionic": DebArchive,
  "focal": DebArchive,
- "centos7": RPMArchive,
  "rhel8": RPMArchive,
  "rhel9": RPMArchive,
  "windows": BaseArchive,

diff --git a/packages/moby-containerd-shim-systemd/mapping.go b/packages/moby-containerd-shim-systemd/mapping.go
@@ -20,7 +20,6 @@ var (
  "bullseye": DebArchive,
  "bionic": DebArchive,
  "focal": DebArchive,
- "centos7": RPMArchive,
  "rhel8": RPMArchive,
  "rhel9": RPMArchive,
  "windows": BaseArchive,

diff --git a/packages/moby-containerd/mapping_1_6.go b/packages/moby-containerd/mapping_1_6.go
@@ -15,7 +15,6 @@ var (
  "focal": DebArchive_1_X,
  "jammy": DebArchive_1_X,
  "noble": DebArchive_1_X,
- "centos7": RPMArchive_1_X,
  "rhel8": RPMArchive_1_X,
  "rhel9": RPMArchive_1_X,
  "mariner2": MarinerArchive_1_X,

diff --git a/packages/moby-containerd/mapping_2_0.go b/packages/moby-containerd/mapping_2_0.go
@@ -15,7 +15,6 @@ var (
  "focal": DebArchive_2_0,
  "jammy": DebArchive_2_0,
  "noble": DebArchive_2_0,
- "centos7": RPMArchive_2_0,
  "rhel8": RPMArchive_2_0,
  "rhel9": RPMArchive_2_0,
  "mariner2": MarinerArchive_2_0,

diff --git a/packages/moby-engine/mapping.go b/packages/moby-engine/mapping.go
@@ -31,7 +31,6 @@ var (
  "bullseye": DebArchive,
  "bionic": DebArchive,
  "focal": DebArchive,
- "centos7": RPMArchive,
  "rhel8": RPMArchive,
  "rhel9": RPMArchive,
  "windows": BaseArchive,

diff --git a/packages/moby-runc/mapping.go b/packages/moby-runc/mapping.go
@@ -9,7 +9,6 @@ var (
  "bullseye": DebArchive,
  "bionic": DebArchive,
  "focal": DebArchive,
- "centos7": RPMArchive,
  "rhel8": RPMArchive,
  "rhel9": RPMArchive,
  "windows": BaseArchive,

diff --git a/packages/moby-tini/mapping.go b/packages/moby-tini/mapping.go
@@ -9,7 +9,6 @@ var (
  "bullseye": DebArchive,
  "bionic": DebArchive,
  "focal": DebArchive,
- "centos7": RPMArchive,
  "rhel8": RPMArchive,
  "rhel9": RPMArchive,
  "windows": BaseArchive,

diff --git a/pkg/archive/rpm.go b/pkg/archive/rpm.go
@@ -14,7 +14,6 @@ var (
  nothing empty
 
  rpmDistroMap = map[string]string{
- "centos7": "el7",
  "rhel8": "el8",
  "rhel9": "el9",
  "mariner2": "cm2",

diff --git a/pkg/archive/spec.go b/pkg/archive/spec.go
@@ -20,7 +20,6 @@ var (
  "noble": "deb",
  "rhel9": "rpm",
  "rhel8": "rpm",
- "centos7": "rpm",
  "mariner2": "rpm",
  "windows": "zip",
  }
@@ -35,7 +34,6 @@ var (
  "noble": "ubuntu",
  "rhel9": "el9",
  "rhel8": "el8",
- "centos7": "el7",
  "mariner2": "cm2",
  "windows": "windows",
  }
@@ -50,7 +48,6 @@ var (
  "noble": "24.04",
  "rhel9": "el9",
  "rhel8": "el8",
- "centos7": "el7",
  "mariner2": "cm2",
  }
 )

diff --git a/targets/centos7.go b/targets/centos7.go
diff --git a/targets/target.go b/targets/target.go
@@ -64,7 +64,6 @@ var targets = map[string]MakeTargetFunc{
  "focal": Focal,
  "rhel8": Rhel8,
  "rhel9": Rhel9,
- "centos7": Centos7,
  "windows": Windows,
  "mariner2": Mariner2,
 }

diff --git a/tests/Dockerfile b/tests/Dockerfile
@@ -1,7 +1,6 @@
 ARG MIRROR=mcr.microsoft.com/mirror/docker/library/
 
 ARG MARINER2_IMG=mcr.microsoft.com/cbl-mariner/base/core:2.0
-ARG CENTOS7_IMG=${MIRROR}centos:7
 ARG RHEL8_IMG=${MIRROR}almalinux:8
 ARG RHEL9_IMG=${MIRROR}almalinux:9
 ARG BUSTER_IMG=${MIRROR}buildpack-deps:buster
@@ -199,41 +198,6 @@ RUN if [ "${INCLUDE_TESTING}" = "1" ]; then \
  cd /opt/bats && ./install.sh /usr/local
 RUN ln -s /lib/systemd/systemd /sbin/init
 
-FROM ${CENTOS7_IMG} AS centos7-jq
-WORKDIR /jq
-ARG BUILDPLATFORM
-ARG TARGETPLATFORM
-ARG TARGETARCH
-ARG TARGETVARIANT
-RUN yum install -y epel-release
-RUN yum install --downloadonly --downloaddir=. jq
-
-FROM ${CENTOS7_IMG} AS centos7
-ARG BUILDPLATFORM
-ARG TARGETPLATFORM
-ARG TARGETARCH
-ARG TARGETVARIANT
-RUN yum install -y systemd ca-certificates
-RUN yum install -y https://packages.microsoft.com/config/centos/7/packages-microsoft-prod.rpm
-ARG INCLUDE_TESTING
-COPY entrypoint.sh /usr/local/bin/docker-entrypoint.sh
-STOPSIGNAL SIGRTMIN+3
-ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]
-COPY --from=bats / /opt/bats
-COPY --from=centos7-jq /jq /opt/jq
-RUN cd /opt/jq && yum install -y ./*.rpm
-RUN if [ "${INCLUDE_TESTING}" = "1" ]; then \
- yum-config-manager --add-repo https://packages.microsoft.com/yumrepos/microsoft-centos7-testing-prod || exit 1; \
- fi; \
- cd /opt/bats && ./install.sh /usr/local
-
-FROM centos7 AS centos7-test
-RUN yum install -y jq createrepo
-COPY centos7/install.sh /opt/moby/
-COPY test.sh /opt/moby/
-COPY --from=bats-support /root/bats /opt/moby/test_helper/bats-support
-COPY --from=bats-assert /root/bats /opt/moby/test_helper/bats-assert
-
 FROM ${MARINER2_IMG} AS mariner2
 ARG BUILDPLATFORM
 ARG TARGETPLATFORM

diff --git a/tests/Makefile b/tests/Makefile
@@ -53,7 +53,6 @@ img: $(TESTDIR)/$(DISTRO)/imageid
 bionic jammy focal bullseye buster bookworm noble: $(wildcard deb/*)
 rpm: rpm-fix-arch.sh
 centos8 rhel8 rhel9: $(wildcard centos8/*) rpm
-centos7: $(wildcard centos7/*) rpm
 mariner2: $(wildcard mariner2/*) rpm
 
 $(TESTDIR)/mariner2/imageid: mariner2/install.sh mariner2/download-pcks.sh

diff --git a/tests/centos7/install.sh b/tests/centos7/install.sh