Update systemd image tag formats in workflow and documentation

Author: cruizba

.github/workflows/build-and-push-docker-image.yml

@@ -61,7 +61,7 @@ jobs:
           build-args: |
             UBUNTU_VERSION=${{ matrix.ubuntu_version }}
           tags: |
-            cruizba/ubuntu-dind:${{ matrix.ubuntu_name }}-${{ env.CURRENT_VERSION }}-systemd
-            cruizba/ubuntu-dind:${{ matrix.ubuntu_name }}-${{ env.CURRENT_VERSION }}-systemd-r${{ env.BUILD_NUMBER }}
+            cruizba/ubuntu-dind:${{ matrix.ubuntu_name }}-systemd-${{ env.CURRENT_VERSION }}
+            cruizba/ubuntu-dind:${{ matrix.ubuntu_name }}-systemd-${{ env.CURRENT_VERSION }}-r${{ env.BUILD_NUMBER }}
             cruizba/ubuntu-dind:${{ matrix.ubuntu_name }}-systemd-latest
             ${{ matrix.ubuntu_version == env.LATEST_UBUNTU_VERSION && 'cruizba/ubuntu-dind:systemd-latest' || '' }}

README.md

@@ -187,9 +187,9 @@ cruizba/ubuntu-dind:jammy-<docker-version>
 cruizba/ubuntu-dind:noble-<docker-version>
 
 # Systemd images
-cruizba/ubuntu-dind:focal-<docker-version>-systemd
-cruizba/ubuntu-dind:jammy-<docker-version>-systemd
-cruizba/ubuntu-dind:noble-<docker-version>-systemd
+cruizba/ubuntu-dind:focal-systemd-<docker-version>
+cruizba/ubuntu-dind:jammy-systemd-<docker-version>
+cruizba/ubuntu-dind:noble-systemd-<docker-version>
 ```
 
 ### Fixed images and revision
@@ -201,9 +201,9 @@ cruizba/ubuntu-dind:jammy-<docker-version>-r<revision>
 cruizba/ubuntu-dind:noble-<docker-version>-r<revision>
 
 # Systemd images
-cruizba/ubuntu-dind:focal-<docker-version>-systemd-r<revision>
-cruizba/ubuntu-dind:jammy-<docker-version>-systemd-r<revision>
-cruizba/ubuntu-dind:noble-<docker-version>-systemd-r<revision>
+cruizba/ubuntu-dind:focal-systemd-<docker-version>-r<revision>
+cruizba/ubuntu-dind:jammy-systemd-<docker-version>-r<revision>
+cruizba/ubuntu-dind:noble-systemd-<docker-version>-r<revision>
 ```
 
 ### Latest Images per Ubuntu version:

create_image.sh

@@ -37,8 +37,8 @@ build_systemd_image() {
 
     docker build \
         --build-arg UBUNTU_VERSION=${ubuntu_version} \
-        -t cruizba/ubuntu-dind:${ubuntu_name}-${DOCKER_VERSION}-systemd \
-        -t cruizba/ubuntu-dind:${ubuntu_name}-${DOCKER_VERSION}-systemd-r${BUILD_NUMBER} \
+        -t cruizba/ubuntu-dind:${ubuntu_name}-systemd-${DOCKER_VERSION} \
+        -t cruizba/ubuntu-dind:${ubuntu_name}-systemd-${DOCKER_VERSION}-r${BUILD_NUMBER} \
         -t cruizba/ubuntu-dind:${ubuntu_name}-systemd-latest \
         -f Dockerfile.systemd .