CE-360 - create a release of orcidlink-enabled kbase-ui running under Europa

.devcontainer/Dockerfile-devcontainer

@@ -1,5 +1,5 @@
-FROM node:18
+FROM node:20
 
-RUN apt-get update && \
-    apt-get install -y npm python3 git make bash && \
-    npm install --location=global npm@10.2.0
+RUN apt-get update && apt-get install -y default-jre
+
+RUN npm install --location=global npm@10.5.2

.devcontainer/devcontainer.json

@@ -14,12 +14,19 @@
     // The optional 'workspaceFolder' property is the path VS Code should open by default when
     // connected. This is typically a file mount in .devcontainer/docker-compose.yml
     "workspaceFolder": "/workspace",
-    // Set *default* container specific settings.json values on container create.
-    "settings": {},
-    // Add the IDs of extensions you want installed when the container is created.
-    "extensions": [
-        "DavidAnson.vscode-markdownlint"
-    ],
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "DavidAnson.vscode-markdownlint",
+                "jebbs.plantuml",
+                "srmeyers.git-prefix",
+                "esbenp.prettier-vscode",
+                "dbaeumer.vscode-eslint",
+                "darkriszty.markdown-table-prettify"
+            ],
+            "settings": {}
+        }
+    },
     // "containerEnv": {
     //     "DEPLOY_ENV": "narrative-dev"
     // }

.devcontainer/docker-compose.yml

@@ -1,107 +1,64 @@
-version: '3.6'
+name: kbase-dev
 networks:
-  kbase-dev:
-    name: kbase-dev
+    kbase-dev:
+        name: kbase-dev
 services:
-  kbase-ui:
-    build:
-      context: .
-      dockerfile: Dockerfile-devcontainer
-    # just use dev for the image tag so we can easily clean
-    # up afterwards.
-
-    image: kbase/kbase-ui:dev
-
-    container_name: kbase-ui
-    dns: 8.8.8.8
-    volumes:
-      # Update this to wherever you want VS Code to mount the folder of your project
-      - ..:/workspace:cached
-      # Uncomment the next line to use Docker from inside the container. See https://aka.ms/vscode-remote/samples/docker-from-docker-compose for details.
-      # - /var/run/docker.sock:/var/run/docker.sock 
-
-      # Uncomment the next four lines if you will use a ptrace-based debugger like C++, Go, and Rust.
-      # cap_add:
-      #   - SYS_PTRACE
-      # security_opt:
-      #   - seccomp:unconfined
-      # volumes:
-      # - ${APP_DIR}:/kb/deployment/app
-      # Map local source into expected location within container
-      # - "${PWD}/react-app:/kb/deployment/app"
-      # # Map local configuration directory into expected location within container
-      # - "${PWD}/dev/gitlab-config:/kb/deployment/config"
-      # - ${PWD}/deployment/scripts:/kb/deployment/scripts
-      # # Map locally installed plugins into the expected location within container
-      # - ${PWD}/build/dist/deploy/plugins:/kb/deployment/app/public/deploy/plugins
-      # - ${SCRIPTS_DIR}:/kb/deployment/scripts
-
-      # just use dev for the image tag so we can easily clean
-      # up afterwards.
-      # image: kbase/kbase-ui:dev
-    networks:
-      - kbase-dev
-    environment:
-      # - PORT=80
-      - DEPLOY_ENV=${DEPLOY_ENV:-ci}
-      # - 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
-    # container.
-    command: /bin/sh -c "while sleep 1000; do :; done"
-  kbase-ui-deploy:
-    image: nginx:1.25.1-alpine
-    container_name: kbase-ui-deploy
-    volumes:
-      - ../build:/usr/share/nginx/html
-      # - /Users/erikpearson/Work/KBase/2023/CE-255/kbase-ui-plugin-react-profile-view/dist/plugin:/usr/share/nginx/html/plugins/react-profile-view
-      # - /Users/erikpearson/Work/KBase/2023/UFI-60/kbase-ui-plugin-auth2-client/dist/plugin:/usr/share/nginx/html/plugins/auth2-client
-      # - /Users/erikpearson/Work/KBase/2023/helpdesk/UFI-48/kbase-ui-plugin-dataview/dist/plugin:/usr/share/nginx/html/plugins/dataview
-      # - /Users/erikpearson/Work/KBase/2023/helpdesk/UFI-48/kbase-ui-plugin-dataview/dist/plugin:/usr/share/nginx/html/plugins/dataview
-      # - /Users/erikpearson/Work/KBase/2022/fix-app-icons/kbase-ui-plugin-organizations/react-app:/usr/share/nginx/html/plugins/organizations
-      # - /Users/erikpearson/Work/KBase/2022/UIP-7/kbase-ui-plugin-auth2-client/dist/plugin:/usr/share/nginx/html/plugins/auth2-client
-      # - /Users/erikpearson/Work/KBase/2022/UIP-7/kbase-ui-plugin-auth2-client/dist/plugin:/usr/share/nginx/html/plugins/auth2-client
-    networks:
-      - kbase-dev
-    ports:
-      - "8081:80"
-    environment:
-      # um, does nothing?
-      # for now, set the proxy port to 80 to match the default
-      # nginx config.
-      # TODO: use the templating built into the nginx image.
-      # or switch to a custom image using dockerize.
-      - NGINX_HOST=kbase-ui-deploy.ci.kbase.us
-      - NGINX_PORT=5000
-  kbase-ui-proxy:
-    build:
-      context: ../tools/proxy
-    # there is only one proxy image, for local development, so just call it :dev
-    image: kbase/kbase-ui-proxy:dev
-    depends_on:
-      - kbase-ui
-      - kbase-ui-deploy
-    networks:
-      - kbase-dev
-    container_name: kbase-ui-proxy
-    ports:
-      - '80:80'
-      - '443:443'
-    dns: 
-      # TODO: sort this out!
-      - 8.8.8.8
-      - 9.9.9.9
-      - 1.1.1.1
-      - 208.67.222.222
-    environment:
-      - BASE_PATH=/
-
-
-    # note that this is really a 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. 
-
-    env_file: 
-      - ../tools/proxy/conf/ci.env
-      - custom.env
+    kbase-ui:
+        build:
+            context: .
+            dockerfile: Dockerfile-devcontainer
+        image: kbase/kbase-ui:dev
+        container_name: kbase-ui
+        dns: 8.8.8.8
+        volumes:
+            # Update this to wherever you want VS Code to mount the folder of your project
+            - ..:/workspace:cached
+        networks:
+            - kbase-dev
+        env_file:
+            - runtime.env
+        # 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
+        # container.
+        command: /bin/sh -c "while sleep 1000; do :; done"
+    kbase-ui-deploy:
+        image: nginx:1.25.4-alpine3.18
+        container_name: kbase-ui-deploy
+        volumes:
+            - ../build:/usr/share/nginx/html
+            # Example of volume mounts for local plugins
+            # - /Users/erikpearson/Work/KBase/2023/europa-integration/kbase-ui-plugin-auth2-client/dist/plugin:/usr/share/nginx/html/plugins/auth2-client
+            # - /Users/erikpearson/Work/KBase/2023/europa-integration/kbase-ui-plugin-catalog/dist/plugin:/usr/share/nginx/html/plugins/catalog
+            # - /Users/erikpearson/Work/KBase/2023/europa-integration/kbase-ui-plugin-dataview/dist/plugin:/usr/share/nginx/html/plugins/dataview
+            # - /Users/erikpearson/Work/KBase/2023/europa-integration/kbase-ui-plugin-typeview/dist/plugin:/usr/share/nginx/html/plugins/typeview
+            # - /Users/erikpearson/Work/KBase/2023/europa-integration/kbase-ui-plugin-data-search/dist/plugin:/usr/share/nginx/html/plugins/data-search
+            # - /Users/erikpearson/Work/KBase/2023/europa-integration/kbase-ui-plugin-jgi-search/dist/plugin:/usr/share/nginx/html/plugins/jgi-search
+            # - /Users/erikpearson/Work/KBase/2023/europa-integration/kbase-ui-plugin-organizations/dist/plugin:/usr/share/nginx/html/plugins/organizations
+            # - /Users/erikpearson/Work/KBase/2023/europa-integration/kbase-ui-plugin-samples/dist/plugin:/usr/share/nginx/html/plugins/samples
+        networks:
+            - kbase-dev
+        ports:
+            - '8081:80'
+    kbase-ui-proxy:
+        build:
+            context: ../tools/proxy
+        # there is only one proxy image, for local development, so just call it :dev
+        image: kbase/kbase-ui-proxy:dev
+        depends_on:
+            - kbase-ui
+            - kbase-ui-deploy
+        networks:
+            - kbase-dev
+        container_name: kbase-ui-proxy
+        ports:
+            - '80:80'
+            - '443:443'
+        dns:
+            # TODO: sort this out!
+            - 8.8.8.8
+            - 9.9.9.9
+            - 1.1.1.1
+            - 208.67.222.222
+        env_file:
+            - proxy.env

.github/workflows/manual.yml

@@ -1,14 +1,14 @@
 ---
 name: Manual
 on:
- workflow_dispatch:
+    workflow_dispatch:
 jobs:
-  test:
-    uses: ./.github/workflows/reusable_test-crats.yml
-  build-push:
-    needs: test
-    uses: ./.github/workflows/reusable_build-push.yml
-    with:
-      name: '${{ github.event.repository.name }}'
-      tags: '${{ github.ref_name }}'
-    secrets: inherit
+    test:
+        uses: ./.github/workflows/reusable_test.yml
+    build-push:
+        needs: test
+        uses: ./.github/workflows/reusable_build-push.yml
+        with:
+            name: '${{ github.event.repository.name }}'
+            tags: 'manual-${{ github.ref_name }}'
+        secrets: inherit

.github/workflows/pull-request-to-main-activity.yml

@@ -1,20 +1,20 @@
 ---
 name: PR to main3 opened
 on:
-  pull_request:
-    branches:
-      - main3
-    types:
-      - opened
-      - reopened
-      - synchronize
+    pull_request:
+        branches:
+            - main3
+        types:
+            - opened
+            - reopened
+            - synchronize
 jobs:
-  test:
-    uses: ./.github/workflows/reusable_test.yml
-  build-push:
-    needs: test
-    uses: ./.github/workflows/reusable_build-push.yml
-    with:
-      name: '${{ github.event.repository.name }}'
-      tags: pr${{ github.event.number }}
-    secrets: inherit
+    test:
+        uses: ./.github/workflows/reusable_test.yml
+    build-push:
+        needs: test
+        uses: ./.github/workflows/reusable_build-push.yml
+        with:
+            name: '${{ github.event.repository.name }}'
+            tags: pr-${{ github.event.number }}
+        secrets: inherit

.github/workflows/reusable_build-push.yml

@@ -16,7 +16,7 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - name: Check out GitHub Repo
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
 
             - name: Get current date
               id: date
@@ -28,10 +28,10 @@ jobs:
               run: ./Taskfile build-kbase-ui
 
             - name: Set up Docker Buildx
-              uses: docker/setup-buildx-action@v2
+              uses: docker/setup-buildx-action@v3
 
             - name: Login to GHCR
-              uses: docker/login-action@v2
+              uses: docker/login-action@v3
               with:
                   registry: ghcr.io
                   # note that the calling workflow must set `secrets: inherit`
@@ -40,7 +40,7 @@ jobs:
 
             - name: Create github action tags from image tags
               id: tags
-              uses: actions/github-script@v6
+              uses: actions/github-script@v7
               with:
                   result-encoding: string
                   script: |
@@ -52,7 +52,7 @@ jobs:
                       }).join(',');
 
             - name: Build and push
-              uses: docker/build-push-action@v3
+              uses: docker/build-push-action@v5
               with:
                   context: .
                   file: ./Dockerfile