From 293913753f6ce40d822a1f572464b578c7ad069a Mon Sep 17 00:00:00 2001 From: Bernie Muluu Date: Wed, 12 Oct 2022 16:54:38 +0300 Subject: [PATCH] Updated serverAndUI Dockerfile Nginx was not running so the UI was not being served. --- docker/serverAndUI/Dockerfile | 4 ++-- docs/docs/gettingstarted/docker.md | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docker/serverAndUI/Dockerfile b/docker/serverAndUI/Dockerfile index 6d3cbbdbd6..1722e07269 100644 --- a/docker/serverAndUI/Dockerfile +++ b/docker/serverAndUI/Dockerfile @@ -44,8 +44,8 @@ LABEL maintainer="Netflix OSS " RUN mkdir -p /app/config /app/logs /app/libs # Copy the compiled output to new image -COPY --from=builder /conductor/docker/server/bin /app -COPY --from=builder /conductor/docker/server/config /app/config +COPY --from=builder /conductor/docker/serverAndUI/bin /app +COPY --from=builder /conductor/docker/serverAndUI/config /app/config COPY --from=builder /conductor/server/build/libs/conductor-server-*-boot.jar /app/libs # Copy compiled UI assets to nginx www directory diff --git a/docs/docs/gettingstarted/docker.md b/docs/docs/gettingstarted/docker.md index de4ec5b665..75c9dd45be 100644 --- a/docs/docs/gettingstarted/docker.md +++ b/docs/docs/gettingstarted/docker.md @@ -111,7 +111,10 @@ Go to [http://127.0.0.1:9090](http://127.0.0.1:9090). This image at `/docker/serverAndUI` is provided to illustrate starting both the server & UI within the same container. The UI is hosted using nginx. ### Building the combined image -`docker build -t conductor:serverAndUI .` +From the `docker` directory, +``` +docker build -t conductor:serverAndUI -f serverAndUI/Dockerfile ../ +``` ### Running the combined image - With interal DB: `docker run -p 8080:8080 -p 80:5000 -d -t conductor:serverAndUI`