Skip to content

Commit

Permalink
Issue #3628: rename target to be in line with the image name
Browse files Browse the repository at this point in the history
  • Loading branch information
bschmalhofer committed Jul 30, 2024
1 parent 2470811 commit 7418e5a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions hooks/build
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions otobo.nginx.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down

0 comments on commit 7418e5a

Please sign in to comment.