Skip to content

Commit

Permalink
Remove Ubuntu 18.04, Alpine 3.13 and Alpine 3.14 OS support. (#444)
Browse files Browse the repository at this point in the history
  • Loading branch information
@dhurley
dhurley authored Aug 31, 2023
1 parent ce207b7 commit 0a4eca8
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 25 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,6 @@ jobs:
version: "9"
- image: "ubuntu"
version: "22.04"
- image: "alpine"
version: "3.14"
- image: "alpine"
version: "3.15"
- image: "alpine"
Expand Down
36 changes: 18 additions & 18 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,24 @@ VERSION = $(shell git describe --match "v[0-9]*" --abbrev=0 --tags)
COMMIT = $(shell git rev-parse --short HEAD)
DATE = $(shell date +%F_%H-%M-%S)

# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# https://docs.nginx.com/nginx/releases/ #
# These images are based on https://github.com/nginxinc/docker-nginx and are NOT recommended for production #
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# | OS_RELEASE | OS_VERSION | NOTES |
# | ---------------- | -------------------------------------------- | -------------------------------------------------------------- |
# | amazonlinux | 2, 2023 | |
# | ubuntu | 18.04, 20.04, 22.04 | |
# | debian | bookworm-slim, bullseye-slim, buster-slim | |
# | centos | 7 | |
# | redhatenterprise | 7, 8, 9 | |
# | rockylinux | 8, 9 | |
# | almalinux | 8, 9 | |
# | alpine | 3.13, 3.14, 3.15, 3.16, 3.17 | |
# | oraclelinux | 7, 8 , 9 | |
# | suse | sles12sp5, sle15 | |
# | freebsd | | Not supported |
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# https://docs.nginx.com/nginx/releases/ #
# These images are based on https://github.com/nginxinc/docker-nginx and are NOT recommended for production #
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
# | OS_RELEASE | OS_VERSION | NOTES |
# | ---------------- | ----------------------------------------- | -------------------------------------------------------------- |
# | amazonlinux | 2, 2023 | |
# | ubuntu | 20.04, 22.04 | |
# | debian | bookworm-slim, bullseye-slim, buster-slim | |
# | centos | 7 | |
# | redhatenterprise | 7, 8, 9 | |
# | rockylinux | 8, 9 | |
# | almalinux | 8, 9 | |
# | alpine | 3.15, 3.16, 3.17 | |
# | oraclelinux | 7, 8, 9 | |
# | suse | sles12sp5, sle15 | |
# | freebsd | | Not supported |
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
OS_RELEASE ?= ubuntu
OS_VERSION ?= 22.04
BASE_IMAGE = "${CONTAINER_REGISTRY}/${OS_RELEASE}:${OS_VERSION}"
Expand Down
4 changes: 2 additions & 2 deletions Makefile.packaging
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ GITHUB_PACKAGES_DIR := ./build/github/packages
AZURE_PACKAGES_DIR := ./build/azure/packages
GPG_PUBLIC_KEY := .key

DEB_DISTROS?=ubuntu-jammy-22.04 ubuntu-focal-20.04 ubuntu-bionic-18.04 debian-bookworm-12 debian-bullseye-11 debian-buster-10
DEB_DISTROS?=ubuntu-jammy-22.04 ubuntu-focal-20.04 debian-bookworm-12 debian-bullseye-11 debian-buster-10
DEB_ARCHS?=arm64 amd64
RPM_DISTROS?=centos-7-x86_64 oraclelinux-7-x86_64 oraclelinux-8-x86_64 oraclelinux-9-x86_64 suse-12-x86_64 suse-15-x86_64
RPM_ARCH=x86_64
Expand All @@ -17,7 +17,7 @@ REDHAT_ARCHS?=aarch64 x86_64
ROCKY_VERSIONS?=rocky-8 rocky-9
ROCKY_ARCHS?=aarch64 x86_64
FREEBSD_DISTROS?="FreeBSD:12:amd64" "FreeBSD:13:amd64"
APK_VERSIONS?=3.13 3.14 3.15 3.16 3.17
APK_VERSIONS?=3.15 3.16 3.17
APK_ARCHS?=aarch64 x86_64
ALMA_VERSIONS?=almalinux-8 almalinux-9
ALMA_ARCHS?=aarch64 x86_64
Expand Down
3 changes: 0 additions & 3 deletions hugo/content/technical-specifications.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ AlmaLinux
- 9 (x86_64, aarch64)

Alpine Linux
- 3.13 (x86_64, aarch64)
- 3.14 (x86_64, aarch64)
- 3.15 (x86_64, aarch64)
- 3.16 (x86_64, aarch64)
- 3.17 (x86_64, aarch64)
Expand Down Expand Up @@ -61,7 +59,6 @@ SUSE Linux Enterprise Server (SLES)
- 15 SP2 (x86_64)

Ubuntu
- 18.04 LTS (x86_64, aarch64)
- 20.04 LTS (x86_64, aarch64)
- 22.04 LTS (x86_64, aarch64)

Expand Down

0 comments on commit 0a4eca8

Please sign in to comment.