Adapt Dockerfile for kuksa-val-server build

Signed-off-by: Sebastian Schildt <[email protected]>

docker/Dockerfile

@@ -39,8 +39,8 @@ RUN make -j 6
 RUN make install
 
 ADD . /kuksa.val
-RUN  rm -rf /kuksa.val/build  && mkdir  /kuksa.val/build 
-WORKDIR /kuksa.val/build
+RUN  rm -rf /kuksa.val/kuksa-val-server/build  && mkdir  /kuksa.val/kuksa-val-server/build 
+WORKDIR /kuksa.val/kuksa-val-server/build
 RUN cmake ..
 RUN make -j 4
 RUN ls

docker/Dockerfile.dev

@@ -32,8 +32,8 @@ RUN ./b2 -j 6 install
 
 
 ADD . /kuksa.val
-RUN  rm -rf /kuksa.val/build  && mkdir  /kuksa.val/build 
-WORKDIR /kuksa.val/build
+RUN  rm -rf /kuksa.val/kuksa-val-server/build  && mkdir  /kuksa.val/kuksa-val-server/build 
+WORKDIR /kuksa.val/kuksa-val-server/build
 RUN cmake .. -DBUILD_UNIT_TEST=ON -DCMAKE_BUILD_TYPE=Coverage
 RUN make -j8
 

docker/collect-deployment-artifacts.sh

@@ -10,15 +10,15 @@
 # Helper script to collect executables, config and libraries needed for minimal docker
 
 mkdir /deploy
-cp /kuksa.val/build/src/kuksa-val-server /deploy
+cp /kuksa.val/kuksa-val-server/build/src/kuksa-val-server /deploy
 
 cp /kuksa.val/docker/startkuksaval.sh /deploy
 
-ldd /kuksa.val/build/src/kuksa-val-server | grep "=>" | awk '{print $3}' |   xargs -I '{}' cp -v '{}' /deploy
+ldd /kuksa.val/kuksa-val-server/build/src/kuksa-val-server | grep "=>" | awk '{print $3}' |   xargs -I '{}' cp -v '{}' /deploy
 
 mkdir /deploy/exampleconfig
 mkdir /deploy/exampleconfig/certs
 
-cp /kuksa.val/build/src/config.ini  /deploy/exampleconfig/config.ini
-cp /kuksa.val/build/src/vss_release_2.2.json  /deploy/exampleconfig/vss.json
+cp /kuksa.val/kuksa-val-server/build/src/config.ini  /deploy/exampleconfig/config.ini
+cp /kuksa.val/kuksa-val-server/build/src/vss_release_2.2.json  /deploy/exampleconfig/vss.json
 cp -r  /kuksa.val/kuksa_certificates/* /deploy/exampleconfig/certs/