Updated Dockerfiles to reflect new location for utils.sh

Author: ChrisMaunder

Docker/Dockerfile-2.7.0

@@ -235,6 +235,7 @@ WORKDIR /src
 # Copy only the bits we need to for the .NET compilation steps
 COPY /CodeProject.AI-Server-Dev/src/server/                        src/server/
 COPY /CodeProject.AI-Server-Dev/src/SDK/                           src/SDK/
+COPY /CodeProject.AI-Server-Dev/src/scripts/                       src/scripts/
 COPY /CodeProject.AI-Server-Dev/modules/ObjectDetectionYOLOv5Net/  modules/ObjectDetectionYOLOv5Net/
 
 # Build and publish Server
@@ -325,7 +326,7 @@ RUN mv -f  "/app/publish/preinstalled-modules/ObjectDetectionYOLOv5-6.2/modulese
 # SDK and install scripts
 COPY ["CodeProject.AI-Server-Dev/src/SDK/Python",        "/app/publish/SDK/Python"]
 COPY ["CodeProject.AI-Server-Dev/src/server/install.sh", "/app/publish/server/install.sh"]
-COPY ["CodeProject.AI-Server-Dev/devops/scripts",        "/app/publish/devops/scripts"]
+COPY ["CodeProject.AI-Server-Dev/src/scripts",           "/app/publish/src/scripts"]
 COPY ["CodeProject.AI-Server-Dev/src/setup.sh",          "/app/publish/setup.sh"]
 
 # Cleanup / setup

Docker/Dockerfile-Arm64-2.7.0

@@ -209,6 +209,7 @@ WORKDIR /src
 # Copy only the bits we need to for the .NET compilation steps
 COPY src/server/                        src/server/
 COPY src/SDK/                           src/SDK/
+COPY src/scripts/                       src/scripts/
 COPY modules/ObjectDetectionYOLOv5Net/  src/modules/ObjectDetectionYOLOv5Net/
 
 # Build and publish Server
@@ -300,7 +301,7 @@ RUN mv -f "/app/publish/preinstalled-modules/ObjectDetectionYOLOv5-6.2/moduleset
 # SDK and install scripts
 COPY ["src/SDK/Python",        "/app/publish/SDK/Python"]
 COPY ["src/server/install.sh", "/app/publish/server/install.sh"]
-COPY ["devops/scripts",        "/app/publish/devops/scripts"]
+COPY ["src/scripts",           "/app/publish/src/scripts"]
 COPY ["src/setup.sh",          "/app/publish/setup.sh"]
 
 # Cleanup / setup

Docker/Dockerfile-GPU-CUDA-2.7.0

@@ -188,6 +188,7 @@ WORKDIR /src
 # Copy only the bits we need to for the .NET compilation steps
 COPY src/server/                        src/server/
 COPY src/SDK/                           src/SDK/
+COPY src/scripts/                       src/scripts/
 COPY modules/ObjectDetectionYOLOv5Net/  modules/ObjectDetectionYOLOv5Net/
 
 # Build and publish Server
@@ -276,7 +277,7 @@ RUN rm -rf /app/publish/preinstalled-modules/ObjectDetectionYOLOv5-6.2/__pycache
 # SDK and install scripts
 COPY ["src/SDK/Python",        "/app/publish/SDK/Python"]
 COPY ["src/server/install.sh", "/app/publish/server/install.sh"]
-COPY ["devops/scripts",        "/app/publish/devops/scripts"]
+COPY ["src/scripts",           "/app/publish/src/scripts"]
 COPY ["src/setup.sh",          "/app/publish/setup.sh"]
 
 # Cleanup / setup

Docker/Dockerfile-GPU-CUDA10_2-2.7.0

@@ -188,6 +188,7 @@ WORKDIR /src
 # Copy only the bits we need to for the .NET compilation steps
 COPY src/server/                        src/server/
 COPY src/SDK/                           src/SDK/
+COPY src/scripts/                       src/scripts/
 COPY modules/ObjectDetectionYOLOv5Net/  src/modules/ObjectDetectionYOLOv5Net/
 
 # Build and publish Server
@@ -277,7 +278,7 @@ RUN mv -f  /app/publish/preinstalled-modules/ObjectDetectionYOLOv5-3.1/moduleset
 # SDK and install scripts
 COPY ["src/SDK/Python",        "/app/publish/SDK/Python"]
 COPY ["src/server/install.sh", "/app/publish/server/install.sh"]
-COPY ["devops/scripts",        "/app/publish/devops/scripts"]
+COPY ["src/scripts",           "/app/publish/src/scripts"]
 COPY ["src/setup.sh",          "/app/publish/setup.sh"]
 
 # Cleanup / setup

Docker/Dockerfile-Jetson-2.7.0

@@ -223,6 +223,7 @@ WORKDIR /src
 # Copy only the bits we need to for the .NET compilation steps
 COPY src/server/                        src/server/
 COPY src/SDK/                           src/SDK/
+COPY src/scripts/                       src/scripts/
 
 # Build and publish Server
 WORKDIR "/src/src/server"
@@ -289,7 +290,7 @@ RUN mv -f /app/publish/preinstalled-modules/ObjectDetectionCoral/modulesettings.
 # SDK and install scripts
 COPY ["src/SDK/Python",        "/app/publish/SDK/Python"]
 COPY ["src/server/install.sh", "/app/publish/server/install.sh"]
-COPY ["devops/scripts",        "/app/publish/devops/scripts"]
+COPY ["src/scripts",           "/app/publish/src/scripts"]
 COPY ["src/setup.sh",          "/app/publish/setup.sh"]
 
 # Cleanup / setup

Docker/Dockerfile-RPi64-2.7.0

@@ -204,6 +204,7 @@ WORKDIR /src
 # Copy only the bits we need to for the .NET compilation steps
 COPY src/server/                        src/server/
 COPY src/SDK/                           src/SDK/
+COPY src/scripts/                       src/scripts/
 COPY modules/ObjectDetectionYOLOv5Net/  src/modules/ObjectDetectionYOLOv5Net/
 
 # Build and publish Server
@@ -305,7 +306,7 @@ COPY ["src/SDK/Python",        "/app/publish/SDK/Python"]
 COPY ["src/server/install.sh", "/app/publish/server/install.sh"]
 RUN rm -rf /app/publish/SDK/Python/__pycache__
 
-COPY ["src/SDK/Scripts", "/app/publish/SDK/Scripts"]
+COPY ["src/src/scripts", "/app/publish/src/scripts"]
 COPY ["src/setup.sh",    "/app/publish/setup.sh"]
 
 # END REVIEW ===================================================================