From 6b212f195dc9331b743c124d055d448aa32e8404 Mon Sep 17 00:00:00 2001 From: bernhard Date: Mon, 29 Jul 2024 17:48:46 +0200 Subject: [PATCH] Issue #3628: otobo.kerberos.web.dockerfile is no longer needed that file was just a workaround for automated builds on Docker Hub --- .github/workflows/docker_image_builder.yml | 2 +- otobo.kerberos.web.dockerfile | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 otobo.kerberos.web.dockerfile diff --git a/.github/workflows/docker_image_builder.yml b/.github/workflows/docker_image_builder.yml index 64e1e5aacf..b6cb37b84f 100644 --- a/.github/workflows/docker_image_builder.yml +++ b/.github/workflows/docker_image_builder.yml @@ -30,7 +30,7 @@ jobs: dockerfile: 'otobo.web.dockerfile' tag_prefix: 'devel' - target: 'otobo-web-kerberos' - dockerfile: 'otobo.kerberos.web.dockerfile' + dockerfile: 'otobo.web.dockerfile' tag_prefix: 'devel-kerberos' steps: diff --git a/otobo.kerberos.web.dockerfile b/otobo.kerberos.web.dockerfile deleted file mode 100644 index c5ae77af1f..0000000000 --- a/otobo.kerberos.web.dockerfile +++ /dev/null @@ -1,17 +0,0 @@ -# This Dockerfile is needed for the OTOBO web docker image with support for Kerberos. -# -# Actually, this file is not used for building the image. It is only a standin as -# Docker Hub checks the existence of the configured Dockerfile when it automatically -# builds images. For the actual build the hook in the script hooks/build is called. -# That script declares that the Dockerfile otobo.web.dockerfile is to be used for building the image. -# -# There is an extra build target otobo-web-kerberos that add support for Kerberos. This -# complicated setup allows that a multiple images are build with a single Dockerfile. Thus -# it is guaranteed that the images do not diverge. - -# See also bin/docker/build_docker_images.sh -# See also https://docs.docker.com/docker-hub/builds/advanced/ -# See also https://doc.otobo.org/manual/installation/10.1/en/content/installation-docker.html - -# just to have a valid Dockerfile -FROM perl:5.38-bookworm