Make docker image builds able to be called from repo's root

PepeluDev · PepeluDev · commit d19e5a8b6179 · 2021-09-26T23:32:47.000+02:00
diff --git a/cpp/docker/Dockerfile b/cpp/docker/Dockerfile
@@ -1,10 +1,10 @@
 FROM cppserverbase:latest as builder
 
 COPY . /code
-WORKDIR /code/build
+WORKDIR /code/cpp/build
 RUN  cmake -DCMAKE_BUILD_TYPE=Release .. \
     && make -j4 && mkdir -p /cppserver \
-    && cp /code/build/src/main/cpp/cpphttpserver /cppserver/cppserver \
+    && cp /code/cpp/build/src/main/cpp/cpphttpserver /cppserver/cppserver \
     && rm -rf /code
 
 WORKDIR /cppserver
diff --git a/cpp/scripts/build.sh b/cpp/scripts/build.sh
@@ -1,3 +1,5 @@
 #!/bin/bash
 
-docker build --no-cache -t cppserverhttp2talk -f docker/Dockerfile .
+readonly GIT_ROOT_DIR=$(git rev-parse --show-toplevel)
+
+docker build --no-cache -t cppserverhttp2talk -f ${GIT_ROOT_DIR}/cpp/docker/Dockerfile .
diff --git a/cpp/scripts/buildBase.sh b/cpp/scripts/buildBase.sh
@@ -1,3 +1,5 @@
 #!/bin/bash
 
-docker build --no-cache -t cppserverbase -f docker/Dockerfile .
+readonly GIT_ROOT_DIR=$(git rev-parse --show-toplevel)
+
+docker build -t cppserverbase -f ${GIT_ROOT_DIR}/cpp/docker/base/Dockerfile .
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -23,5 +23,5 @@ services:
 
 networks:
   default:
-    name: myhttp2-network
+    name: http2-network
     attachable: true
diff --git a/node/scripts/build.sh b/node/scripts/build.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+readonly GIT_ROOT_DIR=$(git rev-parse --show-toplevel)
+
+docker build --no-cache -t nodeserverhttp2talk -f ${GIT_ROOT_DIR}/node/docker/Dockerfile .
diff --git a/node/scripts/build/build.sh b/node/scripts/build/build.sh
