Issue #3628: mixed up the naming of the targets

otobo-kerberos-web becomes otobo-web-kerberos, just like in rel-11_0
RotherOSS · Jul 29, 2024 · fd22f13 · fd22f13
1 parent 3710c61
commit fd22f13
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/docker_image_builder.yml b/.github/workflows/docker_image_builder.yml
@@ -24,12 +24,12 @@ jobs:
 
       # create two different images
       matrix:
-        target: [ 'otobo-web', 'otobo-kerberos-web', ]
+        target: [ 'otobo-web', 'otobo-web-kerberos', ]
         include:
           - target:     'otobo-web'
             dockerfile: 'otobo.web.dockerfile'
             tag_prefix: 'devel'
-          - target:     'otobo-kerberos-web'
+          - target:     'otobo-web-kerberos'
             dockerfile: 'otobo.kerberos.web.dockerfile'
             tag_prefix: 'devel-kerberos'
 

diff --git a/hooks/build b/hooks/build
@@ -21,7 +21,7 @@
 # In newer version different image are built with the same Dockerfile.
 TARGET_OPTION=$(case $DOCKERFILE_PATH in
     "otobo.web.dockerfile")                  echo "--target=otobo-web" ;;
-    "otobo.kerberos.web.dockerfile")         echo "--target=otobo-kerberos-web" ;;
+    "otobo.kerberos.web.dockerfile")         echo "--target=otobo-web-kerberos" ;;
     *)                                       echo "" ;;
 esac)
 

diff --git a/otobo.kerberos.web.dockerfile b/otobo.kerberos.web.dockerfile
@@ -11,7 +11,7 @@
 # This avoids a surprising change of the version of Debian when the image
 # is rebuilt, especially when the image for a new release of OTOBO is built.
 # Note that the minor version of Debian may change between builds.
-FROM perl:5.36-bookworm AS otobo-kerberos-web
+FROM perl:5.36-bookworm AS otobo-web-kerberos
 
 # First there is some initial setup that needs to be done by root.
 USER root