From 626af2372fff454067910b1ff11fbcac93e0bcd3 Mon Sep 17 00:00:00 2001 From: Jan Michael Ong Date: Thu, 2 Feb 2023 16:10:21 -0800 Subject: [PATCH] feat(ETHOS-43940): Remove deprecated bases --- .github/workflows/main.yml | 6 ------ README.md | 6 ------ 2 files changed, 12 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7ecf291..71a6658 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,16 +18,10 @@ jobs: # This is the default variant-less distribution (ex. 3.2.1) - Dockerfile: Dockerfile-ubuntu-20.04 # Variant distributions below all have semantic versions + suffix (ex. 3.2.1-ubuntu-18.04) - - Dockerfile: Dockerfile-ubuntu-18.04 - suffix: ubuntu-18.04 - Dockerfile: Dockerfile-ubuntu-20.04 suffix: ubuntu-20.04 - Dockerfile: Dockerfile-ubuntu-22.04 suffix: ubuntu-22.04 - - Dockerfile: Dockerfile-alpine - suffix: alpine - - Dockerfile: Dockerfile-centos-7 - suffix: centos-7 steps: - name: Checkout diff --git a/README.md b/README.md index 956c733..b691e37 100644 --- a/README.md +++ b/README.md @@ -13,10 +13,6 @@ Provides base OS, security patches, and tools for quick and easy spinup. | ------------- | --------------------------- | ------------------ | | Ubuntu 20.04 | `-VERSION#-ubuntu-20.04` | Current | | Ubuntu 22.04 | `-VERSION#-ubuntu-22.04` | Current | -| Alpine | `-alpine` | **DEPRECATED** | -| CentOS 7 | `-centos-7` | **DEPRECATED** | - -`Alpine`, `CentOS 7` will be removed November 2022. ### Tools @@ -38,8 +34,6 @@ On Ubuntu and CentOS-based variants, run: This file is actually a symlink to the variant-specific script contained in the `/scripts` folder -NOTE: for Alpine variant, which is security-conscious, but does not have a mechanism to isolate security-specific updates, use `apk update && apk upgrade` as a generic alternative. - ### Packaging A convenience script is provided for post-package installation cleanup