Skip to content

Commit 5b2a84a

Browse files
Limit Ubuntu version support to 24.04 only
- Update build and push scripts to only support Ubuntu 24.04 (Noble) - Keep extensible structure for future Ubuntu version support - Add warning messages for unsupported Ubuntu versions - Update README to reflect current Ubuntu 24.04 only support Co-authored-by: matifali <[email protected]>
1 parent 59903a3 commit 5b2a84a

File tree

3 files changed

+19
-47
lines changed

3 files changed

+19
-47
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ under the `ubuntu` tag.
1919

2020
For Ubuntu-based images, additional version-specific tags are automatically created
2121
to provide stability and prevent unexpected breaking changes when the base Ubuntu
22-
version is updated:
22+
version is updated.
23+
24+
Currently supported Ubuntu versions:
2325

2426
- `ubuntu-24.04` - Ubuntu 24.04 LTS (Noble Numbat)
2527
- `ubuntu-noble` - Ubuntu Noble Numbat (24.04 LTS)
26-
- `ubuntu-22.04` - Ubuntu 22.04 LTS (Jammy Jellyfish)
27-
- `ubuntu-jammy` - Ubuntu Jammy Jellyfish (22.04 LTS)
2828

2929
Example usage:
3030

scripts/build_images.sh

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -110,34 +110,20 @@ for image in "${IMAGES[@]}"; do
110110
ubuntu_base=$(grep "^FROM ubuntu:" "$image_path" | head -1 | cut -d: -f2)
111111
if [ -n "$ubuntu_base" ]; then
112112
# Map Ubuntu codenames to version numbers
113+
# Currently only Ubuntu 24.04 (Noble) is supported
113114
case "$ubuntu_base" in
114115
"noble")
115116
ubuntu_version="24.04"
116117
;;
117-
"jammy")
118-
ubuntu_version="22.04"
119-
;;
120-
"focal")
121-
ubuntu_version="20.04"
118+
"24.04")
119+
ubuntu_version="24.04"
120+
ubuntu_codename="noble"
122121
;;
123122
*)
124-
# If it's already a version number, use it directly
125-
if [[ "$ubuntu_base" =~ ^[0-9]+\.[0-9]+$ ]]; then
126-
ubuntu_version="$ubuntu_base"
127-
# Map version numbers to codenames
128-
case "$ubuntu_version" in
129-
"24.04")
130-
ubuntu_codename="noble"
131-
;;
132-
"22.04")
133-
ubuntu_codename="jammy"
134-
;;
135-
"20.04")
136-
ubuntu_codename="focal"
137-
;;
138-
esac
139-
else
140-
ubuntu_version=""
123+
# Unsupported Ubuntu version - skip version-specific tags
124+
ubuntu_version=""
125+
if [ $QUIET = false ]; then
126+
echo "Warning: Ubuntu version '$ubuntu_base' not supported for version-specific tags. Only Ubuntu 24.04 (Noble) is currently supported." >&2
141127
fi
142128
;;
143129
esac

scripts/push_images.sh

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -114,34 +114,20 @@ for image in "${IMAGES[@]}"; do
114114
ubuntu_base=$(grep "^FROM ubuntu:" "$image_path" | head -1 | cut -d: -f2)
115115
if [ -n "$ubuntu_base" ]; then
116116
# Map Ubuntu codenames to version numbers
117+
# Currently only Ubuntu 24.04 (Noble) is supported
117118
case "$ubuntu_base" in
118119
"noble")
119120
ubuntu_version="24.04"
120121
;;
121-
"jammy")
122-
ubuntu_version="22.04"
123-
;;
124-
"focal")
125-
ubuntu_version="20.04"
122+
"24.04")
123+
ubuntu_version="24.04"
124+
ubuntu_codename="noble"
126125
;;
127126
*)
128-
# If it's already a version number, use it directly
129-
if [[ "$ubuntu_base" =~ ^[0-9]+\.[0-9]+$ ]]; then
130-
ubuntu_version="$ubuntu_base"
131-
# Map version numbers to codenames
132-
case "$ubuntu_version" in
133-
"24.04")
134-
ubuntu_codename="noble"
135-
;;
136-
"22.04")
137-
ubuntu_codename="jammy"
138-
;;
139-
"20.04")
140-
ubuntu_codename="focal"
141-
;;
142-
esac
143-
else
144-
ubuntu_version=""
127+
# Unsupported Ubuntu version - skip version-specific tags
128+
ubuntu_version=""
129+
if [ $QUIET = false ]; then
130+
echo "Warning: Ubuntu version '$ubuntu_base' not supported for version-specific tags. Only Ubuntu 24.04 (Noble) is currently supported." >&2
145131
fi
146132
;;
147133
esac

0 commit comments

Comments
 (0)