CE-314

.devcontainer/docker-compose.yml

@@ -44,7 +44,7 @@ services:
     environment:
       # - PORT=80
       - DEPLOY_ENV=${DEPLOY_ENV:-ci}
-      # - BASE_PATH=
+      - BASE_PATH=${BASE_PATH}
     # Required for a devcontainer -- keeps the container running.
     # Don't worry, our main interaction with the container is through the 
     # VSC terminal, which for a devcontainer opens a shell within the
@@ -95,10 +95,10 @@ services:
       - 1.1.1.1
       - 208.67.222.222
     environment:
-      - BASE_PATH=/
+      - BASE_PATH=${BASE_PATH}
 
 
-    # note that this is really a docker env file and is relative to the docker-compose file 
+    # note that this is really aq docker env file and is relative to the docker-compose file 
     # TODO: I think we may need to use an entrypoint which selects the deploy environment
     # config (env) file based on the DEPLOY_ENV. 
 

.github/workflows/manual.yml

@@ -4,7 +4,7 @@ on:
  workflow_dispatch:
 jobs:
   test:
-    uses: ./.github/workflows/reusable_test-crats.yml
+    uses: ./.github/workflows/reusable_test.yml
   build-push:
     needs: test
     uses: ./.github/workflows/reusable_build-push.yml

.gitignore

@@ -30,6 +30,7 @@ yarn.lock
 # /react-app/public/data
 # !/react-app/public/data/README.md
 _working/
+_todo/
 
 # General purpose temp directory
 /temp/*

Dockerfile

@@ -50,4 +50,4 @@ ENTRYPOINT [ "dockerize" ]
 CMD [  \
     "-template", "/kb/deployment/templates/nginx.conf.tmpl:/etc/nginx/nginx.conf", \
     "-template", "/kb/deployment/templates/config.json.tmpl:/kb/deployment/app/deploy/config.json", \
-    "bash", "/kb/deployment/scripts/start-server.bash" ]
+    "bash", "-x", "/kb/deployment/scripts/start-server.bash" ]

Taskfile

@@ -108,7 +108,7 @@ function format {
 }
 
 function render-templates {
-    env DIR="${PWD}" ENV="${ENV:-ci}" DEFAULT_PATH="${DEFAULT_PATH}" bash tools/dockerize/scripts/render-templates.sh
+    env DIR="${PWD}" ENV="${ENV:-ci}" DEFAULT_PATH="${DEFAULT_PATH}" BASE_PATH="${BASE_PATH}" bash tools/dockerize/scripts/render-templates.sh
 }
 
 # Optional dev tooling:
@@ -125,6 +125,14 @@ function start-local-server {
 	docker compose up 
 }
 
+function build-image {
+    ./scripts/host/build-image.sh
+}
+
+function run-image {
+    ./scripts/host/run-image.sh
+}
+
 #
 # TO PORT
 #

config/README.md

@@ -1,14 +1,3 @@
 # Configuration
 
 This directory contains files necessary to configure kbase ui builds:
-
-```services.yml`` is a YAML file containing definitions of all service endpoints which need to be known to the ui. Most service endpoints are defined as template strings in which the base url is placeholder which is populated at runtime by the deployment configuration (more about that later.)
-
-
-```npmInstall.yml``` is a YAML file containing declarative instructions for installing each and every package brought into the project via bower. 
-
-
-- ```builds``` - one file per named configuration set.
-- ```deploy``` - classic KBase deploy configuration: service urls, target dirs, per KBase deploy environment.
-- ```ui``` - ui build configurations
-- ```bowerInstall``` - master file for importing bower packages into kbase module space.

deployment/templates/config.json.tmpl

@@ -2,7 +2,7 @@
     "deploy": {
         "id": "kbase-ui",
         "target": "/kb/deployment/app",
-        "basePath":  "{{ default "" .Env.deploy_basepath }}",
+        "basePath":  "{{ default "" .Env.BASE_PATH }}",
         "environment": "{{ .Env.deploy_environment }}",
         "displayEnvironment": {{ eq .Env.deploy_environment "prod" | ternary true false }},
         "hostname": "{{ .Env.deploy_hostname }}",
@@ -174,7 +174,7 @@
         "defaults": {
             "path": {
                 "type": "path",
-                "value": "{{ default "/narratives" .Env.DEFAULT_PATH }}"
+                "value": "{{ default "#about" .Env.DEFAULT_PATH }}"
             },
             "hideHeader": {{ default "false" .Env.HIDE_HEADER }},
             "hideNavigation": {{ default "false" .Env.HIDE_NAVIGATION }},