Updates to config and build scripts following namespace changes (#126)

finos · Mar 17, 2022 · 01f2142 · 01f2142
1 parent 96e0aab
commit 01f2142
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/dev/containers/build_runtime.bat b/dev/containers/build_runtime.bat
@@ -1,7 +1,7 @@
 @echo off
 
 set BUILD_IMAGE=python:3.10
-set TRAC_IMAGE="trac/runtime-python"
+set TRAC_IMAGE="tracdap/runtime-python"
 
 REM Get repo root dir
 for %%A IN ("%~dp0..") do set REPO_DIR=%%~dpA
@@ -28,4 +28,4 @@ echo TRAC version = %TRAC_VERSION%
 
 @echo on
 docker run --mount type=bind,source=%REPO_DIR%,target=/mnt/trac %BUILD_IMAGE% /mnt/trac/dev/containers/build_runtime_inner.sh
-docker build -t "%TRAC_IMAGE%:%TRAC_VERSION%" "%REPO_DIR%trac-runtime\python"
+docker build -t "%TRAC_IMAGE%:%TRAC_VERSION%" "%REPO_DIR%tracdap-runtime\python"
diff --git a/dev/containers/build_runtime.sh b/dev/containers/build_runtime.sh
@@ -17,7 +17,7 @@
 REPO_DIR=$(cd "$(dirname "$0")/../.." && pwd)
 
 BUILD_IMAGE=python:3.10
-TRAC_IMAGE=trac/runtime-python
+TRAC_IMAGE=tracdap/runtime-python
 
 
 # Look up TRAC version
@@ -39,5 +39,5 @@ echo TRAC version = ${TRAC_VERSION}
 
 
 set -x
-docker run --mount "type=bind,source=${REPO_DIR},target=/mnt/trac" ${BUILD_IMAGE} /mnt/trac/dev/containers/build_runtime_inner.sh
-docker build -t "${TRAC_IMAGE}:${TRAC_VERSION}" "${REPO_DIR}/trac-runtime/python"
+docker run --mount "type=bind,source=${REPO_DIR},target=/mnt/tracdap" ${BUILD_IMAGE} /mnt/tracdap/dev/containers/build_runtime_inner.sh
+docker build -t "${TRAC_IMAGE}:${TRAC_VERSION}" "${REPO_DIR}/tracdap-runtime/python"
diff --git a/dev/containers/build_runtime_inner.sh b/dev/containers/build_runtime_inner.sh
@@ -15,8 +15,6 @@
 # limitations under the License.
 
 pip install --upgrade pip
-pip install -r /mnt/trac/trac-runtime/python/requirements.txt
+pip install -r /mnt/tracdap/tracdap-runtime/python/requirements.txt
 
-python /mnt/trac/dev/codegen/protoc-ctrl.py python_runtime --proto_path trac-api/trac-metadata/src/main/proto --out trac-runtime/python/generated/trac/rt_gen/domain
-python /mnt/trac/dev/codegen/protoc-ctrl.py python_proto --proto_path trac-api/trac-metadata/src/main/proto --out trac-runtime/python/generated/trac/rt_gen/proto
-python /mnt/trac/trac-runtime/python/package-ctrl.py
+python /mnt/tracdap/tracdap-runtime/python/build_runtime.py
diff --git a/etc/trac-devlocal.yaml b/etc/trac-devlocal.yaml
@@ -73,7 +73,7 @@ services:
       # Add your own repositories in here to load models into TRAC
       example_repo:
         repoType: git
-        repoUrl: https://github.com/accenture/trac
+        repoUrl: https://github.com/finos/tracdap
 
     executor:
       executorType: LOCAL

diff --git a/tracdap-libs/tracdap-lib-test/src/main/resources/config/trac-unit.yaml b/tracdap-libs/tracdap-lib-test/src/main/resources/config/trac-unit.yaml
@@ -71,7 +71,7 @@ services:
     repositories:
       UNIT_TEST_REPO:
         repoType: git
-        repoUrl: https://github.com/accenture/trac
+        repoUrl: https://github.com/finos/tracdap
 
     executor:
       executorType: LOCAL