Merge branch 'main' into snyk-upgrade-2cdf9cc0dc11ed6576b6bf5c4b052d48

Author: paynejd

.eslintrc.json

@@ -251,7 +251,10 @@
           "waitlist",
           "vectorized",
           "intensional",
-          "nullable"
+          "nullable",
+          "versioning",
+          "unversioned",
+          "reranker"
         ],
         "skipIfMatch": [
           "http://[^s]*",

.github/workflows/build.yml

@@ -49,19 +49,26 @@ jobs:
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
-    #- name: Log in to the Container registry
-    #  uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
-    #  with:
-    #    registry: ghcr.io
-    #    username: ${{ github.actor }}
-    #    password: ${{ secrets.GITHUB_TOKEN }}
+    - name: Setup SSH for premium repos
+      run: |
+        mkdir -p ~/.ssh
+        echo "${{ secrets.PRIVATE_GIT_PACKAGES_DEPLOY_KEY }}" > ~/.ssh/id_rsa
+        chmod 600 ~/.ssh/id_rsa
+        ssh-keyscan github.com >> ~/.ssh/known_hosts
+    - name: Setup SSH agent
+      uses: webfactory/ssh-agent@v0.9.0
+      with:
+        ssh-private-key: ${{ secrets.PRIVATE_GIT_PACKAGES_DEPLOY_KEY }}
     - name: Build and push Docker image
       uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
       with:
         context: .
         push: true
+        ssh: default
         tags: openconceptlab/oclweb3:nightly, openconceptlab/oclweb3:${{ steps.package-version.outputs.current-version}}-${{env.GITHUB_SHA_SHORT}}
-        build-args: SOURCE_COMMIT=${{env.GITHUB_SHA_SHORT}}
+        build-args: |
+          SOURCE_COMMIT=${{env.GITHUB_SHA_SHORT}}
+          PRIVATE_PACKAGES_GIT=${{secrets.PRIVATE_PACKAGES_GIT}}
 
   release:
     needs: [build]

Dockerfile

@@ -1,4 +1,6 @@
 # Stage-1 Build and Development Environment
+# syntax=docker/dockerfile:1.4
+
 FROM node:14.11 as build
 ARG NODE_ENV=production
 ARG NODE_OPTIONS=--max_old_space_size=700
@@ -13,6 +15,7 @@ ENV HOTJAR_ID=${HOTJAR_ID}
 ENV LOGIN_REDIRECT_URL=${LOGIN_REDIRECT_URL}
 ENV OIDC_RP_CLIENT_ID=${OIDC_RP_CLIENT_ID}
 ENV OIDC_RP_CLIENT_SECRET=${OIDC_RP_CLIENT_SECRET}
+ENV ANALYTICS_API=${ANALYTICS_API}
 RUN mkdir /app
 WORKDIR /app
 ENV PATH /app/node_modules/.bin:$PATH
@@ -22,6 +25,17 @@ ADD package-lock.json /app/
 
 RUN npm ci --production=false
 
+# OPTIONAL: install private premium UI package during image build
+# Example installs a package from a private repo/subdir
+ARG PRIVATE_PACKAGES_GIT
+RUN --mount=type=ssh \
+  mkdir -p /root/.ssh && \
+  ssh-keyscan github.com >> /root/.ssh/known_hosts && \
+  if [ -n "$PRIVATE_PACKAGES_GIT" ]; then \
+    echo "Installing premium UI packages:" $PRIVATE_PACKAGES_GIT && \
+    npm i $PRIVATE_PACKAGES_GIT; \
+  fi
+
 ADD webpack.config.js /app/
 ADD .babelrc /app/
 ADD src /app/src/

docker-compose.override.yml

@@ -8,6 +8,7 @@ services:
       target: build
       args:
         NODE_ENV: development
+        PRIVATE_PACKAGES_GIT:
     ports:
       - "4002:4002"
       - "4003:35729"

docker-compose.sso.yml

@@ -8,6 +8,7 @@ services:
       target: build
       args:
         NODE_ENV: development
+        PRIVATE_PACKAGES_GIT:
     ports:
       - "4002:4002"
       - "4003:35729"

docker-compose.yml

@@ -7,6 +7,7 @@ services:
       context: .
       args:
         NODE_ENV: production
+        PRIVATE_PACKAGES_GIT:
     ports:
       - "4002:4002"
     restart: on-failure
@@ -16,6 +17,7 @@ services:
       - WEB_PORT=4002
       - RECAPTCHA_SITE_KEY=${RECAPTCHA_SITE_KEY-6LeIxAcTAAAAAJcZVRqyHh71UMIEGNQ_MXjiZKhI}
       - GA_ACCOUNT_ID=${GA_ACCOUNT_ID-UA-000000-01}
+      - ANALYTICS_API=${ANALYTICS_API-}
       - ERRBIT_URL
       - ERRBIT_KEY
       - HOTJAR_ID