Updated serverAndUI Dockerfile to set the correct startup script

docker/serverAndUI/Dockerfile

@@ -44,8 +44,8 @@ LABEL maintainer="Netflix OSS <conductor@netflix.com>"
 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

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`