diff --git a/demo-livelab/demo-lab-nosql/data.sh b/demo-livelab/demo-lab-nosql/data.sh index d07cc98..a90d38c 100644 --- a/demo-livelab/demo-lab-nosql/data.sh +++ b/demo-livelab/demo-lab-nosql/data.sh @@ -1,6 +1,6 @@ mkdir ~/BaggageData cd ~/BaggageData -curl https://objectstorage.us-ashburn-1.oraclecloud.com/p/GzwEz9xBCBHrd0gx1QE0U8hqvNTKzmKcs1pSx3CQ2Ip9A05Z1vHgPNeVRMx_1cLp/n/c4u04/b/livelabsfiles/o/data-management-library-files/BaggageData.tar.gz -o BaggageData.tar.gz +curl https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/BaggageData.tar.gz -o BaggageData.tar.gz tar xvzf BaggageData.tar.gz rm BaggageData.tar.gz diff --git a/demo-livelab/serverless-with-nosql-database/data.sh b/demo-livelab/serverless-with-nosql-database/data.sh index 525b5d9..fc0a32d 100644 --- a/demo-livelab/serverless-with-nosql-database/data.sh +++ b/demo-livelab/serverless-with-nosql-database/data.sh @@ -1,6 +1,6 @@ mkdir ~/BaggageData cd ~/BaggageData -curl https://objectstorage.us-ashburn-1.oraclecloud.com/p/GzwEz9xBCBHrd0gx1QE0U8hqvNTKzmKcs1pSx3CQ2Ip9A05Z1vHgPNeVRMx_1cLp/n/c4u04/b/livelabsfiles/o/data-management-library-files/BaggageData.tar.gz -o BaggageData.tar.gz +curl https://c4u04.objectstorage.us-ashburn-1.oci.customer-oci.com/p/EcTjWk2IuZPZeNnD_fYMcgUhdNDIDA6rt9gaFj_WZMiL7VvxPBNMY60837hu5hga/n/c4u04/b/livelabsfiles/o/data-management-library-files/BaggageData.tar.gz -o BaggageData.tar.gz tar xvzf BaggageData.tar.gz rm BaggageData.tar.gz diff --git a/demo-livelab/serverless-with-nosql-database/functions-fn/api/demo-api/Dockerfile b/demo-livelab/serverless-with-nosql-database/functions-fn/api/demo-api/Dockerfile deleted file mode 100644 index 860fe7c..0000000 --- a/demo-livelab/serverless-with-nosql-database/functions-fn/api/demo-api/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -#FROM fnproject/node:dev as build-stage -#WORKDIR /function -#ADD package-lock.json /function/ -#ADD package.json /function/ -#RUN npm install -#RUN node -v - -FROM node:12-slim -WORKDIR /function -ADD . /function/ -#COPY --from=build-stage /function/node_modules/ /function/node_modules/ -RUN npm install -RUN ls -lrt /function/* -RUN node -v -ENTRYPOINT ["node", "func.js"] diff --git a/demo-livelab/serverless-with-nosql-database/functions-fn/api/demo-api/func.yaml b/demo-livelab/serverless-with-nosql-database/functions-fn/api/demo-api/func.yaml index c967d30..baf92c5 100644 --- a/demo-livelab/serverless-with-nosql-database/functions-fn/api/demo-api/func.yaml +++ b/demo-livelab/serverless-with-nosql-database/functions-fn/api/demo-api/func.yaml @@ -1,7 +1,10 @@ schema_version: 20180708 name: demo-api version: 0.0.1 -runtime: docker +runtime: node +build_image: fnproject/node:18-dev +run_image: fnproject/node:18 +entrypoint: node func.js memory: 256 timeout: 120 -idle_timeout: 1800 +idle_timeout: 1800 \ No newline at end of file diff --git a/demo-livelab/serverless-with-nosql-database/functions-fn/load/demo-keyval-load/Dockerfile b/demo-livelab/serverless-with-nosql-database/functions-fn/load/demo-keyval-load/Dockerfile deleted file mode 100644 index 860fe7c..0000000 --- a/demo-livelab/serverless-with-nosql-database/functions-fn/load/demo-keyval-load/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -#FROM fnproject/node:dev as build-stage -#WORKDIR /function -#ADD package-lock.json /function/ -#ADD package.json /function/ -#RUN npm install -#RUN node -v - -FROM node:12-slim -WORKDIR /function -ADD . /function/ -#COPY --from=build-stage /function/node_modules/ /function/node_modules/ -RUN npm install -RUN ls -lrt /function/* -RUN node -v -ENTRYPOINT ["node", "func.js"] diff --git a/demo-livelab/serverless-with-nosql-database/functions-fn/load/demo-keyval-load/func.yaml b/demo-livelab/serverless-with-nosql-database/functions-fn/load/demo-keyval-load/func.yaml index 37d4d3b..78a6412 100644 --- a/demo-livelab/serverless-with-nosql-database/functions-fn/load/demo-keyval-load/func.yaml +++ b/demo-livelab/serverless-with-nosql-database/functions-fn/load/demo-keyval-load/func.yaml @@ -1,7 +1,10 @@ schema_version: 20180708 name: demo-keyval-load version: 0.0.1 -runtime: docker +runtime: node +build_image: fnproject/node:18-dev +run_image: fnproject/node:18 +entrypoint: node func.js memory: 256 timeout: 120 -idle_timeout: 1800 +idle_timeout: 1800 \ No newline at end of file diff --git a/demo-livelab/serverless-with-nosql-database/functions-fn/load/demo-load/Dockerfile b/demo-livelab/serverless-with-nosql-database/functions-fn/load/demo-load/Dockerfile deleted file mode 100644 index 33e4d1d..0000000 --- a/demo-livelab/serverless-with-nosql-database/functions-fn/load/demo-load/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ - -#FROM fnproject/node:dev as build-stage -#WORKDIR /function -#ADD package-lock.json /function/ -#ADD package.json /function/ -#RUN npm install -#RUN node -v - -FROM node:12-slim -WORKDIR /function -ADD . /function/ -#COPY --from=build-stage /function/node_modules/ /function/node_modules/ -RUN npm install -RUN ls -lrt /function/* -RUN node -v -ENTRYPOINT ["node", "func.js"] diff --git a/demo-livelab/serverless-with-nosql-database/functions-fn/load/demo-load/func.yaml b/demo-livelab/serverless-with-nosql-database/functions-fn/load/demo-load/func.yaml index 2505a08..4de7646 100644 --- a/demo-livelab/serverless-with-nosql-database/functions-fn/load/demo-load/func.yaml +++ b/demo-livelab/serverless-with-nosql-database/functions-fn/load/demo-load/func.yaml @@ -1,7 +1,10 @@ schema_version: 20180708 name: demo-load version: 0.0.1 -runtime: docker +runtime: node +build_image: fnproject/node:18-dev +run_image: fnproject/node:18 +entrypoint: node func.js memory: 256 timeout: 120 -idle_timeout: 1800 +idle_timeout: 1800 \ No newline at end of file diff --git a/demo-livelab/serverless-with-nosql-database/functions-fn/streaming/load-target/func.yaml b/demo-livelab/serverless-with-nosql-database/functions-fn/streaming/load-target/func.yaml index be27f1a..1640909 100644 --- a/demo-livelab/serverless-with-nosql-database/functions-fn/streaming/load-target/func.yaml +++ b/demo-livelab/serverless-with-nosql-database/functions-fn/streaming/load-target/func.yaml @@ -2,6 +2,8 @@ schema_version: 20180708 name: load-target version: 0.0.1 runtime: python +build_image: fnproject/python:3.11-dev +run_image: fnproject/python:3.11 entrypoint: /python/bin/fdk /function/func.py handler memory: 256 timeout: 300 diff --git a/demo-livelab/serverless-with-nosql-database/functions.tf b/demo-livelab/serverless-with-nosql-database/functions.tf index 8068229..71cdb97 100644 --- a/demo-livelab/serverless-with-nosql-database/functions.tf +++ b/demo-livelab/serverless-with-nosql-database/functions.tf @@ -9,6 +9,7 @@ resource oci_functions_application export_nosql_demos_1 { defined_tags = { } display_name = "nosql_demos" + shape = "GENERIC_ARM" freeform_tags = { } subnet_ids = [ diff --git a/examples-nosql-cluster-deployment/README.md b/examples-nosql-cluster-deployment/README.md index fe639c1..91fdc65 100644 --- a/examples-nosql-cluster-deployment/README.md +++ b/examples-nosql-cluster-deployment/README.md @@ -216,14 +216,14 @@ In this demo, we will use the Oracle NoSQL Database bundle - Enterprise Edition For more information about difference between versions (CE vs EE) and other topics, visit the [FAQ](https://www.oracle.com/database/technologies/nosqldb-learnmore-nosqldb-faq.html) ```bash -unzip kv-ee-23.3.30.zip -d nosql +unzip kv-ee-23.3.32.zip -d nosql unzip nosql-migrator-1.5.0.zip ```` Modify the file `env.sh` and `env-proxy.sh` with the appropriate kvhome path location. e.g. ```bash -export KVHOME=$HOME/nosql/kv-23.3.30 +export KVHOME=$HOME/nosql/kv-23.3.32 ``` Download, unzip NoSQL SDK for Java and compile the NoSQL SDK for Java examples. We will use java programs to test the configuration. Other language SDKs @@ -509,7 +509,7 @@ The following error can be safely ignored when running the command `bash stop.sh ````bash $ bash stop.sh -23.3.30 2023-12-01 19:36:45 UTC Build id: c5db6593507b Edition: Client +23.3.32 2024-03-06 18:21:38 UTC Build id: 69f48431fc69 Edition: Client Failed to stop SNA: Bootstrap config file /home/opc/nosql/kvroot/config.xml does not exist ```` diff --git a/examples-nosql-cluster-deployment/script/env-proxy.sh b/examples-nosql-cluster-deployment/script/env-proxy.sh index fa85e3f..663fea6 100644 --- a/examples-nosql-cluster-deployment/script/env-proxy.sh +++ b/examples-nosql-cluster-deployment/script/env-proxy.sh @@ -3,7 +3,7 @@ # Copyright (c) 2023, 2024 Oracle and/or its affiliates. # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/ -export KVHOME=$HOME/nosql/kv-23.3.30 +export KVHOME=$HOME/nosql/kv-23.3.32 export KVHOST=`hostname` export KVSTORE=OUG export PROXYHOME=/home/opc/proxy diff --git a/examples-nosql-cluster-deployment/script/env.sh b/examples-nosql-cluster-deployment/script/env.sh index f7d801b..4cd8210 100644 --- a/examples-nosql-cluster-deployment/script/env.sh +++ b/examples-nosql-cluster-deployment/script/env.sh @@ -3,7 +3,7 @@ # Copyright (c) 2023, 2024 Oracle and/or its affiliates. # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/ -export KVHOME=$HOME/nosql/kv-23.3.30 +export KVHOME=$HOME/nosql/kv-23.3.32 export KVROOT=$HOME/nosql/kvroot export KVDATA=$HOME/nosql/data diff --git a/zips/README.md b/zips/README.md deleted file mode 100644 index cd4889e..0000000 --- a/zips/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# Oracle NoSQL Database Examples - -This directory contains zips files allowing us to deploy the current examples separately. - diff --git a/zips/demo-lab-baggage.zip b/zips/demo-lab-baggage.zip index eb01210..2935c74 100644 Binary files a/zips/demo-lab-baggage.zip and b/zips/demo-lab-baggage.zip differ diff --git a/zips/demo-lab-nosql.zip b/zips/demo-lab-nosql.zip index 1dc98db..cbe90f0 100644 Binary files a/zips/demo-lab-nosql.zip and b/zips/demo-lab-nosql.zip differ diff --git a/zips/examples-nosql-cluster-deployment.zip b/zips/examples-nosql-cluster-deployment.zip index 3c4e002..2a38675 100644 Binary files a/zips/examples-nosql-cluster-deployment.zip and b/zips/examples-nosql-cluster-deployment.zip differ diff --git a/zips/serverless-with-nosql-database.zip b/zips/serverless-with-nosql-database.zip index 387594c..03a52cc 100644 Binary files a/zips/serverless-with-nosql-database.zip and b/zips/serverless-with-nosql-database.zip differ diff --git a/zips/video-on-demand-with-nosql-database.zip b/zips/video-on-demand-with-nosql-database.zip index 47cf968..1c3ce9c 100644 Binary files a/zips/video-on-demand-with-nosql-database.zip and b/zips/video-on-demand-with-nosql-database.zip differ