Merge pull request #125 from geo-knowledge-hub/master

Update branch b-0.5
geo-knowledge-hub · May 15, 2024 · 8887fc1 · 8887fc1
2 parents 5e8c312 + 1663756
commit 8887fc1
Show file tree

Hide file tree

Showing 43 changed files with 9,885 additions and 7,879 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [18.x]
 
     steps:
     - name: Checkout
@@ -33,7 +33,8 @@ jobs:
     - name: Install & Build
       run: |
         echo @geo-knowledge-hub:registry=http://127.0.0.1:4873 > ~/.npmrc
-        npm install
+
+        npm --legacy-peer-deps install
         npm run build
   
     - name: Test

diff --git a/docker/builder/docker-compose.yml b/docker/builder/docker-compose.yml
@@ -13,7 +13,7 @@ services:
     build:
       context: ${PWD}/docker/builder/services/verdaccio/
       dockerfile: ${PWD}/docker/builder/services/verdaccio/Dockerfile
-    image: verdaccio-registry:5.10
+    image: verdaccio-registry:5.10.2
     hostname: "verdaccio-registry"
     container_name: "verdaccio-registry"
     network_mode: bridge

diff --git a/docker/builder/finish.sh b/docker/builder/finish.sh
@@ -10,4 +10,4 @@
 #
 # 1. Stopping the services
 #
-docker-compose -f docker/builder/docker-compose.yml down
+docker compose -f docker/builder/docker-compose.yml down
diff --git a/docker/builder/services/verdaccio/Dockerfile b/docker/builder/services/verdaccio/Dockerfile
@@ -10,7 +10,7 @@
 
 FROM node:12
 
-RUN npm install -g verdaccio \
+RUN npm install -g verdaccio@5.10.2 \
     && npm install -g verdaccio-auth-memory \
     && npm install -g verdaccio-memory \
     && npm install -g [email protected]

diff --git a/docker/builder/start.sh b/docker/builder/start.sh
@@ -33,28 +33,35 @@ extract_from_quotes() {
 #
 # 1. Configuring the required services to build
 #
-docker-compose -f docker/builder/docker-compose.yml up -d
+docker compose -f docker/builder/docker-compose.yml up -d
 
 #
 # 2. Authenticating on registry
 #
 
 # installing utility tool to auth
-npm install -g npm-cli-login
+npm install -g npm-cli-adduser
 
 # authenticating
-npm-cli-login \
+npm-cli-adduser \
     -u $VERDACCIO_USERNAME \
     -p $VERDACCIO_PASSWORD \
     -e $VERDACCIO_EMAIL \
     -r $VERDACCIO_LOCAL_REGISTRY
 
-echo @geo-knowledge-hub:registry=${VERDACCIO_DOCKER_REGISTRY} > ~/.npmrc
-
 #
 # 3. Publishing JavaScript dependencies from `geo-components-react` to verdaccio
 #
 
+# build required dependencies
+npm install -g rimraf json rollup
+
+# registering the local registry
+echo "@geo-knowledge-hub:registry=${VERDACCIO_DOCKER_REGISTRY}" >> ~/.npmrc
+
+# configuring npm to be compatible with Node 16
+echo "legacy-peer-deps=true" >> ~/.npmrc
+
 # extract the dependencies from the `geo-knowledge-hub`
 # note: `@geo-knowledge-hub` is the scope defined to the `geo-knowledge-hub` packages
 JAVASCRIPT_DEPENDENCIES_VERSION=`cat package.json | grep -e @geo-knowledge-hub/ | tail -n 2`