From 7418e5a0b89dac527351f39cdc6b85d0019b74c7 Mon Sep 17 00:00:00 2001 From: bernhard Date: Tue, 30 Jul 2024 16:38:17 +0200 Subject: [PATCH] Issue #3628: rename target to be in line with the image name --- hooks/build | 4 ++-- otobo.nginx.dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hooks/build b/hooks/build index 75616d706..4f2531be0 100755 --- a/hooks/build +++ b/hooks/build @@ -28,8 +28,8 @@ esac) TARGET_OPTION=$(case $DOCKERFILE_PATH in "otobo.web.dockerfile") echo "--target=otobo-web" ;; "otobo.kerberos.web.dockerfile") echo "--target=otobo-web-kerberos" ;; - "../../otobo.nginx.dockerfile") echo "--target=otobo-nginx" ;; - "../../otobo.nginx-kerberos.dockerfile") echo "--target=otobo-nginx-kerberos" ;; + "../../otobo.nginx.dockerfile") echo "--target=otobo-nginx-webproxy" ;; + "../../otobo.nginx-kerberos.dockerfile") echo "--target=otobo-nginx-kerberos-webproxy" ;; "otobo.elasticsearch.dockerfile") echo "--target=otobo-elasticsearch" ;; *) echo "" ;; esac) diff --git a/otobo.nginx.dockerfile b/otobo.nginx.dockerfile index 496de66d4..6b4ef9033 100644 --- a/otobo.nginx.dockerfile +++ b/otobo.nginx.dockerfile @@ -107,7 +107,7 @@ LABEL org.opencontainers.image.licenses='GNU General Public License v3.0 or late LABEL org.opencontainers.image.url='https://github.com/RotherOSS/otobo' LABEL org.opencontainers.image.vendor='Rother OSS GmbH' -FROM base AS otobo-nginx +FROM base AS otobo-nginx-webproxy # Actually there are two config templates in the directory 'templates'. One for plain Nginx and one for Nginx with # Kerberos support. The not needed template is moved out of the way. @@ -126,7 +126,7 @@ ARG DOCKER_TAG=unspecified LABEL org.opencontainers.image.version=$DOCKER_TAG # Build target with Kerboros support. -FROM base AS otobo-nginx-kerberos +FROM base AS otobo-nginx-kerberos-webproxy # Copy the nginx module ngx_http_auth_spnego_module.so to the official nginx container COPY --from=builder-for-kerberos /usr/lib/nginx/modules/ngx_http_auth_spnego_module.so /usr/lib/nginx/modules