Merge pull request #140 from travier/main-c10s

centos: CentOS Stream 10 is now GA
toolbx-images · Dec 13, 2024 · 8b3f5a5 · 8b3f5a5
2 parents 63383b1 + bc3bb0d
commit 8b3f5a5
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 17 deletions.
diff --git a/.github/workflows/centos.yaml b/.github/workflows/centos.yaml
@@ -21,7 +21,7 @@ on:
 env:
   distro: 'centos'
   distro_pretty: 'CentOS'
-  latest_release: 'stream9'
+  latest_release: 'stream10'
   platforms: 'linux/amd64, linux/arm64'
   registry: 'quay.io/toolbx-images'
 
@@ -36,7 +36,7 @@ jobs:
   build-push-images:
     strategy:
       matrix:
-        release: ['stream9', 'stream10-development']
+        release: ['stream9', 'stream10']
 
     runs-on: ubuntu-24.04
     steps:

diff --git a/README.md b/README.md
@@ -24,23 +24,20 @@ directly use the commands below:
 
 - [Alpine Linux]:
   ```
+  $ toolbox create --image quay.io/toolbx-images/alpine-toolbox:edge
+  $ toolbox enter alpine-toolbox-edge
+
+  $ toolbox create --image quay.io/toolbx-images/alpine-toolbox:3.21
+  $ toolbox enter alpine-toolbox-3.21
+
   $ toolbox create --image quay.io/toolbx-images/alpine-toolbox:3.20
   $ toolbox enter alpine-toolbox-3.20
-  
+
   $ toolbox create --image quay.io/toolbx-images/alpine-toolbox:3.19
   $ toolbox enter alpine-toolbox-3.19
 
   $ toolbox create --image quay.io/toolbx-images/alpine-toolbox:3.18
   $ toolbox enter alpine-toolbox-3.18
-
-  $ toolbox create --image quay.io/toolbx-images/alpine-toolbox:3.17
-  $ toolbox enter alpine-toolbox-3.17
-
-  $ toolbox create --image quay.io/toolbx-images/alpine-toolbox:3.16
-  $ toolbox enter alpine-toolbox-3.16
-
-  $ toolbox create --image quay.io/toolbx-images/alpine-toolbox:edge
-  $ toolbox enter alpine-toolbox-edge
   ```
 
 - [Amazon Linux] Note: Only Amazon Linux 2 comes with [EPEL] enabled by default:
@@ -54,11 +51,11 @@ directly use the commands below:
 
 - [CentOS (Stream)] with [EPEL] enabled by default:
   ```
+  $ toolbox create --image quay.io/toolbx-images/centos-toolbox:stream10
+  $ toolbox enter centos-toolbox-stream10
+
   $ toolbox create --image quay.io/toolbx-images/centos-toolbox:stream9
   $ toolbox enter centos-toolbox-stream9
-
-  $ toolbox create --image quay.io/toolbx-images/centos-toolbox:stream8
-  $ toolbox enter centos-toolbox-stream8
   ```
 
 - [Debian]:

diff --git a/centos/stream10-development/Containerfile → centos/stream10/Containerfile b/centos/stream10-development/Containerfile → centos/stream10/Containerfile
@@ -1,9 +1,9 @@
-FROM quay.io/centos/centos:stream10-development
+FROM quay.io/centos/centos:stream10
 
 LABEL com.github.containers.toolbox="true" \
       com.redhat.component="centos-toolbox" \
       name="centos-toolbox" \
-      version="stream10-development" \
+      version="stream10" \
       usage="This image is meant to be used with the toolbox command" \
       summary="Base image for creating CentOS toolbox containers" \
       maintainer="Timothée Ravier <tim@siosm.fr>"

diff --git a/centos/stream10-development/extra-packages → centos/stream10/extra-packages b/centos/stream10-development/extra-packages → centos/stream10/extra-packages
diff --git a/centos/stream10-development/missing-docs → centos/stream10/missing-docs b/centos/stream10-development/missing-docs → centos/stream10/missing-docs