Skip to content
This repository was archived by the owner on Dec 18, 2024. It is now read-only.

Commit 1518805

Browse files
Adapt Dockerfile for kuksa-val-server build
Signed-off-by: Sebastian Schildt <sebastian.schildt@de.bosch.com>
1 parent 13aff30 commit 1518805

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

docker/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ RUN make -j 6
3939
RUN make install
4040

4141
ADD . /kuksa.val
42-
RUN rm -rf /kuksa.val/build && mkdir /kuksa.val/build
43-
WORKDIR /kuksa.val/build
42+
RUN rm -rf /kuksa.val/kuksa-val-server/build && mkdir /kuksa.val/kuksa-val-server/build
43+
WORKDIR /kuksa.val/kuksa-val-server/build
4444
RUN cmake ..
4545
RUN make -j 4
4646
RUN ls

docker/Dockerfile.dev

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ RUN ./b2 -j 6 install
3232

3333

3434
ADD . /kuksa.val
35-
RUN rm -rf /kuksa.val/build && mkdir /kuksa.val/build
35+
RUN rm -rf /kuksa.val/kuksa-val-server/build && mkdir /kuksa.val/kuksa-val-server/build
3636
WORKDIR /kuksa.val/build
3737
RUN cmake .. -DBUILD_UNIT_TEST=ON -DCMAKE_BUILD_TYPE=Coverage
3838
RUN make -j8

docker/collect-deployment-artifacts.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@
1010
# Helper script to collect executables, config and libraries needed for minimal docker
1111

1212
mkdir /deploy
13-
cp /kuksa.val/build/src/kuksa-val-server /deploy
13+
cp /kuksa.val/kuksa-val-server/build/src/kuksa-val-server /deploy
1414

1515
cp /kuksa.val/docker/startkuksaval.sh /deploy
1616

17-
ldd /kuksa.val/build/src/kuksa-val-server | grep "=>" | awk '{print $3}' | xargs -I '{}' cp -v '{}' /deploy
17+
ldd /kuksa.val/kuksa-val-server/build/src/kuksa-val-server | grep "=>" | awk '{print $3}' | xargs -I '{}' cp -v '{}' /deploy
1818

1919
mkdir /deploy/exampleconfig
2020
mkdir /deploy/exampleconfig/certs
2121

22-
cp /kuksa.val/build/src/config.ini /deploy/exampleconfig/config.ini
23-
cp /kuksa.val/build/src/vss_release_2.2.json /deploy/exampleconfig/vss.json
22+
cp /kuksa.val/kuksa-val-server/build/src/config.ini /deploy/exampleconfig/config.ini
23+
cp /kuksa.val/kuksa-val-server/build/src/vss_release_2.2.json /deploy/exampleconfig/vss.json
2424
cp -r /kuksa.val/kuksa_certificates/* /deploy/exampleconfig/certs/

0 commit comments

Comments
 (0)