Skip to content

Commit eb07ec5

Browse files
author
Chris Maunder
committed
Corrected Docker paths
1 parent 5f89c36 commit eb07ec5

2 files changed

Lines changed: 26 additions & 23 deletions

File tree

‎Docker/build_docker.bat‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
@echo off
1414
setlocal enabledelayedexpansion
1515

16+
REM The location of the root of the server repo relative to this script
17+
set repo_base=..\..\CodeProject.AI-Server-Private
18+
1619
REM Sniff Parameters
1720

1821
set do_all=false
@@ -57,17 +60,17 @@ if /i "!do_all!" == "true" (
5760
)
5861

5962
REM Get Version: We're building for the current server version
60-
for /f "usebackq tokens=2 delims=:," %%a in (`findstr /I /R /C:"\"Major\"[^^{]*$" "..\..\src\server\version.json"`) do (
63+
for /f "usebackq tokens=2 delims=:," %%a in (`findstr /I /R /C:"\"Major\"[^^{]*$" "!repo_base!\src\server\version.json"`) do (
6164
set "major=%%a"
6265
set major=!major:"=!
6366
set major=!major: =!
6467
)
65-
for /f "usebackq tokens=2 delims=:," %%a in (`findstr /I /R /C:"\"Minor\"[^^{]*$" "..\..\src\server\version.json"`) do (
68+
for /f "usebackq tokens=2 delims=:," %%a in (`findstr /I /R /C:"\"Minor\"[^^{]*$" "!repo_base!\src\server\version.json"`) do (
6669
set "minor=%%a"
6770
set minor=!minor:"=!
6871
set minor=!minor: =!
6972
)
70-
for /f "usebackq tokens=2 delims=:," %%a in (`findstr /I /R /C:"\"Patch\"[^^{]*$" "..\..\src\server\version.json"`) do (
73+
for /f "usebackq tokens=2 delims=:," %%a in (`findstr /I /R /C:"\"Patch\"[^^{]*$" "!repo_base!\src\server\version.json"`) do (
7174
set "patch=%%a"
7275
set patch=!patch:"=!
7376
set patch=!patch: =!
@@ -82,29 +85,29 @@ REM Build Images and tag with generic "latest" version for each platform
8285
REM (add --progress=plain --no-cache to param list to see stdout output)
8386

8487
if /i "!do_cpu!" == "true" (
85-
docker buildx build --platform linux/amd64 --no-cache --build-arg CPAI_VERSION=!version! --tag codeproject/ai-server -f Dockerfile ..\..
88+
docker buildx build --platform linux/amd64 --no-cache --build-arg CPAI_VERSION=!version! --tag codeproject/ai-server -f Dockerfile "!repo_base!"
8689
)
8790

8891
if /i "!do_gpu!" == "true" (
8992
REM docker pull cupy/nvidia-cuda:10.2-runtime-ubuntu18.04
9093
REM docker pull nvidia/cuda:11.7.1-cudnn8-runtime-ubuntu22.04
9194
REM docker pull nvidia/cuda:12.2.2-cudnn8-runtime-ubuntu22.04
9295

93-
REM docker buildx build --platform linux/amd64 --no-cache --build-arg CPAI_VERSION=!version! --build-arg CUDA_VERSION=10.2 --build-arg CUDA_MAJOR=10 --tag codeproject/ai-server:cuda10_2 -f Dockerfile-GPU-CUDA10_2 ..\..
94-
docker buildx build --platform linux/amd64 --no-cache --build-arg CPAI_VERSION=!version! --build-arg CUDA_VERSION=11.7.1-cudnn8 --build-arg CUDA_MAJOR=11 --tag codeproject/ai-server:cuda11_7 -f Dockerfile-GPU-CUDA ..\..
95-
docker buildx build --platform linux/amd64 --no-cache --build-arg CPAI_VERSION=!version! --build-arg CUDA_VERSION=12.2.2-cudnn8 --build-arg CUDA_MAJOR=12 --tag codeproject/ai-server:cuda12_2 -f Dockerfile-GPU-CUDA ..\..
96+
REM docker buildx build --platform linux/amd64 --no-cache --build-arg CPAI_VERSION=!version! --build-arg CUDA_VERSION=10.2 --build-arg CUDA_MAJOR=10 --tag codeproject/ai-server:cuda10_2 -f Dockerfile-GPU-CUDA10_2 "!repo_base!"
97+
docker buildx build --platform linux/amd64 --no-cache --build-arg CPAI_VERSION=!version! --build-arg CUDA_VERSION=11.7.1-cudnn8 --build-arg CUDA_MAJOR=11 --tag codeproject/ai-server:cuda11_7 -f Dockerfile-GPU-CUDA "!repo_base!"
98+
docker buildx build --platform linux/amd64 --no-cache --build-arg CPAI_VERSION=!version! --build-arg CUDA_VERSION=12.2.2-cudnn8 --build-arg CUDA_MAJOR=12 --tag codeproject/ai-server:cuda12_2 -f Dockerfile-GPU-CUDA "!repo_base!"
9699
)
97100

98101
if /i "!do_arm!" == "true" (
99-
docker buildx build --platform linux/arm64 --no-cache --build-arg CPAI_VERSION=!version! --no-cache --tag codeproject/ai-server:arm64 -f Dockerfile-Arm64 ..\..
102+
docker buildx build --platform linux/arm64 --no-cache --build-arg CPAI_VERSION=!version! --no-cache --tag codeproject/ai-server:arm64 -f Dockerfile-Arm64 "!repo_base!"
100103
)
101104

102105
if /i "!do_jetson!" == "true" (
103-
docker buildx build --platform linux/arm64 --no-cache --build-arg CPAI_VERSION=!version! --no-cache --tag codeproject/ai-server:jetson -f Dockerfile-Jetson ..\..
106+
docker buildx build --platform linux/arm64 --no-cache --build-arg CPAI_VERSION=!version! --no-cache --tag codeproject/ai-server:jetson -f Dockerfile-Jetson "!repo_base!"
104107
)
105108

106109
if /i "!do_rpi!" == "true" (
107-
docker buildx build --platform linux/arm64 --no-cache --build-arg CPAI_VERSION=!version! --no-cache --tag codeproject/ai-server:rpi64 -f Dockerfile-RPi64 ..\..
110+
docker buildx build --platform linux/arm64 --no-cache --build-arg CPAI_VERSION=!version! --no-cache --tag codeproject/ai-server:rpi64 -f Dockerfile-RPi64 "!repo_base!"
108111
)
109112

110113

‎Docker/build_docker.sh‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313
# rpi - build and push Raspberry Pi image
1414
#
1515

16+
# The location of the root of the server repo relative to this script
17+
repo_base="../../CodeProject.AI-Server-Private"
18+
1619
# Sniff Parameters
1720

1821
do_all=false
@@ -57,12 +60,9 @@ fi
5760

5861
# Get Version: We're building for the current server version
5962

60-
# This script
61-
SCRIPT_PATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
62-
63-
MAJOR=$(grep -o '"Major"\s*:\s*[^,}]*' "${SCRIPT_PATH}/../../src/server/version.json" | sed 's/.*: \(.*\)/\1/')
64-
MINOR=$(grep -o '"Minor"\s*:\s*[^,}]*' "${SCRIPT_PATH}/../../src/server/version.json" | sed 's/.*: \(.*\)/\1/')
65-
PATCH=$(grep -o '"Patch"\s*:\s*[^,}]*' "${SCRIPT_PATH}/../../src/server/version.json" | sed 's/.*: \(.*\)/\1/')
63+
MAJOR=$(grep -o '"Major"\s*:\s*[^,}]*' "${repo_base}/src/server/version.json" | sed 's/.*: \(.*\)/\1/')
64+
MINOR=$(grep -o '"Minor"\s*:\s*[^,}]*' "${repo_base}/src/server/version.json" | sed 's/.*: \(.*\)/\1/')
65+
PATCH=$(grep -o '"Patch"\s*:\s*[^,}]*' "${repo_base}/src/server/version.json" | sed 's/.*: \(.*\)/\1/')
6666
VERSION="${MAJOR}.${MINOR}.${PATCH}"
6767

6868
# Let the user know
@@ -78,32 +78,32 @@ docker pull mcr.microsoft.com/dotnet/sdk:7.0
7878

7979
if [ "$do_cpu" = true ]; then
8080
docker pull docker.io/amd64/ubuntu:22.04
81-
docker buildx build --platform linux/amd64 --build-arg CPIA_VERSION=$VERSION --tag codeproject/ai-server -f Dockerfile ../..
81+
docker buildx build --platform linux/amd64 --build-arg CPIA_VERSION=$VERSION --tag codeproject/ai-server -f Dockerfile "${repo_base}"
8282
fi
8383

8484
if [ "$do_gpu" = true ]; then
8585
# docker pull docker pull cupy/nvidia-cuda:10.2-runtime-ubuntu18.04
8686
docker pull nvidia/cuda:11.7.1-cudnn8-runtime-ubuntu22.04
8787
docker pull nvidia/cuda:12.2.0-runtime-ubuntu22.04
8888

89-
# docker buildx build --platform linux/amd64 --build-arg CPIA_VERSION=$VERSION --build-arg CUDA_VERSION=10.2 --build-arg CUDA_MAJOR=10 --tag codeproject/ai-server:cuda10_2 -f Dockerfile-GPU-CUDA10_2 ../..
90-
docker buildx build --platform linux/amd64 --build-arg CPIA_VERSION=$VERSION --build-arg CUDA_VERSION=11.7.1-cudnn8 --build-arg CUDA_MAJOR=11 --tag codeproject/ai-server:cuda11_7 -f Dockerfile-GPU-CUDA ../..
91-
docker buildx build --platform linux/amd64 --build-arg CPIA_VERSION=$VERSION --build-arg CUDA_VERSION=12.2.0 --build-arg CUDA_MAJOR=12 --tag codeproject/ai-server:cuda12_2 -f Dockerfile-GPU-CUDA ../..
89+
# docker buildx build --platform linux/amd64 --build-arg CPIA_VERSION=$VERSION --build-arg CUDA_VERSION=10.2 --build-arg CUDA_MAJOR=10 --tag codeproject/ai-server:cuda10_2 -f Dockerfile-GPU-CUDA10_2 "${repo_base}"
90+
docker buildx build --platform linux/amd64 --build-arg CPIA_VERSION=$VERSION --build-arg CUDA_VERSION=11.7.1-cudnn8 --build-arg CUDA_MAJOR=11 --tag codeproject/ai-server:cuda11_7 -f Dockerfile-GPU-CUDA "${repo_base}"
91+
docker buildx build --platform linux/amd64 --build-arg CPIA_VERSION=$VERSION --build-arg CUDA_VERSION=12.2.0 --build-arg CUDA_MAJOR=12 --tag codeproject/ai-server:cuda12_2 -f Dockerfile-GPU-CUDA "${repo_base}"
9292
fi
9393

9494
if [ "$do_arm" = true ]; then
9595
docker pull arm64v8/ubuntu:22.04
96-
docker buildx build --platform linux/arm64 --build-arg CPIA_VERSION=$VERSION --no-cache --tag codeproject/ai-server:arm64 -f Dockerfile-Arm64 ../..
96+
docker buildx build --platform linux/arm64 --build-arg CPIA_VERSION=$VERSION --no-cache --tag codeproject/ai-server:arm64 -f Dockerfile-Arm64 "${repo_base}"
9797
fi
9898

9999
if [ "$do_jetson" = true ]; then
100100
docker pull gpuci/cuda-l4t:10.2-runtime-ubuntu18.04
101-
docker buildx build --platform linux/arm64 --build-arg CPIA_VERSION=$VERSION --no-cache --tag codeproject/ai-server:jetson -f Dockerfile-Jetson ../..
101+
docker buildx build --platform linux/arm64 --build-arg CPIA_VERSION=$VERSION --no-cache --tag codeproject/ai-server:jetson -f Dockerfile-Jetson "${repo_base}"
102102
fi
103103

104104
if [ "$do_rpi" = true ]; then
105105
docker pull arm64v8/ubuntu:22.04
106-
docker buildx build --platform linux/arm64 --build-arg CPIA_VERSION=$VERSION --no-cache --tag codeproject/ai-server:rpi64 -f Dockerfile-RPi64 ../..
106+
docker buildx build --platform linux/arm64 --build-arg CPIA_VERSION=$VERSION --no-cache --tag codeproject/ai-server:rpi64 -f Dockerfile-RPi64 "${repo_base}"
107107
fi
108108

109109

0 commit comments

Comments
 (0)