[pull] main from oracle:main

.github/linters/.editorconfig

@@ -0,0 +1,10 @@
+[*.sh]
+binary_next_line = true
+indent_style = space
+indent_size = 4
+insert_final_newline = true
+keep_padding = true
+shell_variant = bash
+space_redirects = true
+switch_case_indent = true
+trim_trailing_whitespace = true

.github/super-linter.env

@@ -1,9 +1,8 @@
 BASH_SEVERITY=warning
-DEFAULT_BRANCH=main
-ERROR_ON_MISSING_EXEC_BIT=true
+DEFAULT_BRANCH=origin/main
 VALIDATE_ALL_CODEBASE=false
 VALIDATE_BASH=true
+VALIDATE_BASH_EXEC=true
 VALIDATE_DOCKERFILE_HADOLINT=true
 VALIDATE_GITHUB_ACTIONS=true
 VALIDATE_MARKDOWN=true
-VALIDATE_SHELL_SHFMT=true

.github/workflows/build-and-push-dev-images.yml

@@ -28,13 +28,13 @@ on:
         required: false
       lang:
         description: List of languages to build
-        default: 'gcc-toolset, golang, nginx, nodejs, php, python, redis, ruby, haproxy'
+        default: 'gcc-toolset, golang, nginx, nodejs, php, python, redis, ruby, haproxy, kubectl, helm, ocne-tools'
         required: false
 
 # Default values for the builds triggered by the push event
 env:
   ol: 'oraclelinux7, oraclelinux8, oraclelinux9'
-  lang: 'gcc-toolset, golang, nodejs, nginx, php, python, redis, ruby, haproxy'
+  lang: 'gcc-toolset, golang, nodejs, nginx, php, python, redis, ruby, haproxy, kubectl, helm, ocne-tools'
 
 jobs:
   prepare:
@@ -154,7 +154,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build image - amd64
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: OracleLinuxDevelopers/${{ matrix.ol }}/${{ matrix.lang }}/${{ matrix.tag }}
           platforms: linux/amd64
@@ -164,7 +164,7 @@ jobs:
             "ghcr.io/${{ needs.prepare.outputs.repository_owner }}/${{ matrix.ol }}-${{ matrix.lang }}:${{ matrix.tag }}${{ matrix.multi && '-amd64' || '' }}"
 
       - name: Build image - arm64
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         if: matrix.multi
         with:
           context: OracleLinuxDevelopers/${{ matrix.ol }}/${{ matrix.lang }}/${{ matrix.tag }}

.github/workflows/build-and-push-instantclient-images.yml

@@ -7,6 +7,7 @@ on:
     paths:
       - 'OracleInstantClient/*/19/*'
       - 'OracleInstantClient/*/21/*'
+      - 'OracleInstantClient/*/23/*'
       - '.github/workflows/build-and-push-instantclient-images.yml'
   workflow_dispatch:
 
@@ -39,8 +40,8 @@ jobs:
             git diff --name-only '${{ github.event.before }}..${{ github.event.after }}' > "${changes}"
             if grep -q build-and-push-instantclient-images.yml "${changes}"; then
               echo "PUSH: Action updated: rebuilding all images"
-              ol="oraclelinux7 oraclelinux8"
-              ic="19 21"
+              ol="oraclelinux7 oraclelinux8 oraclelinux9"
+              ic="19 21 23"
             else
               echo "PUSH: Rebuilding changed images only"
               if grep -q oraclelinux7 "${changes}"; then
@@ -49,17 +50,23 @@ jobs:
               if grep -q oraclelinux8 "${changes}"; then
                 ol="${ol} oraclelinux8"
               fi
+              if grep -q oraclelinux9 "${changes}"; then
+                ol="${ol} oraclelinux9"
+              fi
               if grep -q /19/ "${changes}"; then
                 ic="19"
               fi
               if grep -q /21/ "${changes}"; then
                 ic="${ic} 21"
               fi
+              if grep -q /23/ "${changes}"; then
+                ic="${ic} 23"
+              fi
             fi
           else
             echo "MANUAL: Rebuilding all"
-            ol='oraclelinux7 oraclelinux8'
-            ic="19 21"
+            ol="oraclelinux7 oraclelinux8 oraclelinux9"
+            ic="19 21 23"
           fi
           echo "Rebuilding: ${ol} ${ic}"
           echo "ol=${ol}" >> $GITHUB_OUTPUT
@@ -81,6 +88,12 @@ jobs:
           do
             for i in ${{ steps.linux-version.outputs.ic }}
             do
+              if [[ ${o} = "oraclelinux7" && ${i} = "23" ]]; then
+                continue
+              fi
+              if [[ ${o} = "oraclelinux9" && ${i} = "21" ]]; then
+                continue
+              fi
               docker build --tag ghcr.io/${{ steps.repo-owner.outputs.repo-owner }}/${o}-instantclient:${i} OracleInstantClient/${o}/${i}
             done
           done
@@ -91,6 +104,12 @@ jobs:
           do
             for i in ${{ steps.linux-version.outputs.ic }}
             do
+              if [[ ${o} = "oraclelinux7" && ${i} = "23" ]]; then
+                continue
+              fi
+              if [[ ${o} = "oraclelinux9" && ${i} = "21" ]]; then
+                continue
+              fi
               docker push ghcr.io/${{ steps.repo-owner.outputs.repo-owner }}/${o}-instantclient:${i}
             done
           done

.github/workflows/build-and-push-nosql-image.yml

@@ -64,7 +64,7 @@ jobs:
           TAG: ${{ steps.date.outputs.date }}-ce 
       -
         name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ./NoSQL/ce/
           platforms: linux/amd64,linux/arm64

.github/workflows/build-and-push-nosql-sec-image.yml

@@ -64,7 +64,7 @@ jobs:
           TAG: ${{ steps.date.outputs.date }}-ce-sec
       -
         name: Build and push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           context: ./NoSQL/ce-sec/
           platforms: linux/amd64,linux/arm64

.github/workflows/build-and-push-oci-cli-image.yml

@@ -74,7 +74,7 @@ jobs:
 
       - name: Build and push image
         id: build-and-push
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           build-args: |
             BUILDTIME=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }}

.github/workflows/super-linter.yml

@@ -10,6 +10,11 @@ jobs:
     name: Lint new or modified files
     runs-on: ubuntu-latest
 
+    permissions:
+      contents: read
+      packages: read
+      statuses: write
+
     steps:
       - name: Checkout Git repository with history
         uses: actions/checkout@v4
@@ -20,7 +25,7 @@ jobs:
         run: cat .github/super-linter.env >> "$GITHUB_ENV"
 
       - name: Run Super Linter
-        uses: github/super-linter/slim@v5
+        uses: github/super-linter/slim@v7
         env:
           DEFAULT_BRANCH: main
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

NoSQL/README-sec.md

@@ -14,7 +14,7 @@ This container image uses a simplified version of the Oracle NoSQL Database call
 
 This container image configures an Oracle NoSQL Database secure configuration
 1. Create a KVlite secured configuration with the
-[password complexity policy](https://docs.oracle.com/en/database/other-databases/nosql-database/22.1/security/password-complexity-policies.html)
+[password complexity policy](https://docs.oracle.com/en/database/other-databases/nosql-database/24.3/security/password-complexity-policies.html)
 enabled
 2. Create the `root` user and the file `user.security` that contain property settings for the login as admin
 3. Generate the `certificate.pem` file allowing to establish a HTTP secure communication between the proxy and the driver
@@ -86,7 +86,7 @@ For example, to check the version of KVLite, use the `version` command:
 
 ```shell
 $ docker run --rm -ti --link kvlite:store oracle/nosql:ce-sec  java -Xmx64m -Xms64m -jar lib/kvstore.jar version
-22.3.32 2023-02-14 19:38:03 UTC  Build id: 23acbda81a26 Edition: Community
+24.3.9 2024-09-26 18:01:32 UTC  Build id: 0d82533c492e Edition: Community
 ```
 
 To check the size of the storage shard:
@@ -110,18 +110,17 @@ $ docker run --rm -ti -v secfiles:/shared_conf:ro --link kvlite:store oracle/nos
   -security /shared_conf/user.security
 
   kv-> ping
+
 Pinging components of store kvstore based upon topology sequence #14
 10 partitions and 1 storage nodes
-Time: 2023-02-27 06:37:49 UTC   Version: 22.3.32
+Time: 2024-12-04 12:14:44 UTC   Version: 24.3.9
 Shard Status: healthy: 1 writable-degraded: 0 read-only: 0 offline: 0 total: 1
 Admin Status: healthy
 Zone [name=KVLite id=zn1 type=PRIMARY allowArbiters=false masterAffinity=false]   RN Status: online: 1 read-only: 0 offline: 0
-Storage Node [sn1] on kvlite: 5000    Zone: [name=KVLite id=zn1 type=PRIMARY allowArbiters=false masterAffinity=false]    Status: RUNNING   Ver: 22.3.32 2023-02-14
-19:38:03 UTC  Build id: 23acbda81a26 Edition: Community    isMasterBalanced: true      serviceStartTime: 2023-02-27 06:36:21 UTC
-        Admin [admin1]          Status: RUNNING,MASTER  serviceStartTime: 2023-02-27 06:36:26 UTC       stateChangeTime: 2023-02-27 06:36:25 UTC
-availableStorageSize: 2 GB
-        Rep Node [rg1-rn1]      Status: RUNNING,MASTER sequenceNumber: 361 haPort: 5011 availableStorageSize: 9 GB storageType: HD      serviceStartTime:
-2023-02-27 06:36:28 UTC       stateChangeTime: 2023-02-27 06:36:28 UTC
+Storage Node [sn1] on kvlite: 5000    Zone: [name=KVLite id=zn1 type=PRIMARY allowArbiters=false masterAffinity=false]    Status: RUNNING   Ver: 24.3.9 2024-09-26 18:01:32 UTC  Build id: 0d82533c492e Edition: Community    isMasterBalanced: true     serviceStartTime: 2024-12-04 12:06:43 UTC
+        Admin [admin1]          Status: RUNNING,MASTER  serviceStartTime: 2024-12-04 12:06:47 UTC       stateChangeTime: 2024-12-04 12:06:47 UTC        availableStorageSize: 2 GB
+        Rep Node [rg1-rn1]      Status: RUNNING,MASTER sequenceNumber: 131 haPort: 5011 availableStorageSize: 9 GB storageType: HD      serviceStartTime: 2024-12-04 12:06:49 UTC       stateChangeTime: 2024-12-04 12:06:50 UTC
+
 
   kv-> put kv -key /SomeKey -value SomeValue
   Operation successful, record inserted.
@@ -141,13 +140,17 @@ $ docker run --rm -ti -v secfiles:/shared_conf:ro --link kvlite:store oracle/nos
   tables
     SYS$IndexStatsLease
     SYS$MRTableAgentStat
+    SYS$MRTableInfo
     SYS$MRTableInitCheckpoint
     SYS$PartitionStatsLease
     SYS$SGAttributesTable
     SYS$StreamRequest
     SYS$StreamResponse
+    SYS$TableMetadata
     SYS$TableStatsIndex
     SYS$TableStatsPartition
+    SYS$TopologyHistory
+
   sql-> exit
 ```
 
@@ -203,7 +206,7 @@ $ openssl x509 -text -noout -in /mylocalpath/certificate.pem | grep CN
 
 ````
 Note: the certicate can be customized in the script setup-http-proxy-sec.sh
-(e.g adding [SAN](https://docs.oracle.com/en/database/other-databases/nosql-database/22.1/security/ssl-using-openssl.html))
+(e.g adding [SAN](https://docs.oracle.com/en/database/other-databases/nosql-database/24.3/security/ssl-using-openssl.html))
 
 ## Advanced Scenario: connecting to Oracle NoSQL CE from another host
 
@@ -218,7 +221,7 @@ be made via the Oracle NoSQL Database Proxy on the `KV_PROXY_PORT`.
 First, install the latest version of Oracle NoSQL on your remote host:
 
 ```shell
-KV_VERSION=22.3.32
+KV_VERSION=24.3.9
 rm -rf kv-$KV_VERSION
 DOWNLOAD_ROOT=http://download.oracle.com/otn-pub/otn_software/nosql-database
 DOWNLOAD_FILE="kv-ce-${KV_VERSION}.zip"
@@ -401,7 +404,7 @@ number used for the image tag:
 
 
 ```shell
-KV_VERSION=22.3.32 docker build --build-arg "$KV_VERSION" --tag "oracle/nosql-ce-sec:$KV_VERSION" .
+KV_VERSION=24.3.9 docker build --build-arg "$KV_VERSION" --tag "oracle/nosql-ce-sec:$KV_VERSION" .
 ```
 
 ## More information
@@ -424,9 +427,9 @@ Oracle provides no commercial support for the Oracle NoSQL Community Edition.
 
 ## Copyright
 
-Copyright (c) 2017, 2023 Oracle and/or its affiliates.
+Copyright (c) 2017, 2024 Oracle and/or its affiliates.
 
 [NOSQL]: http://www.oracle.com/technetwork/database/database-technologies/nosqldb/overview/index.html
 [DOCS]: https://docs.oracle.com/en/database/other-databases/nosql-database/index.html
-[Apache-2.0]: https://docs.oracle.com/en/database/other-databases/nosql-database/22.3/license/index.html#NSXLI-GUID-006E432E-1965-45A2-AEDE-204BD05E1560
+[Apache-2.0]: https://docs.oracle.com/en/database/other-databases/nosql-database/24.3/license/apache-license.html
 [GraalVM-License]: https://github.com/graalvm/container/blob/master/LICENSE.md

NoSQL/README.md

@@ -73,7 +73,7 @@ For example, to check the version of KVLite, use the `version` command:
 
 ```shell
 $ docker run --rm -ti --link kvlite:store oracle/nosql:ce  java -Xmx64m -Xms64m -jar lib/kvstore.jar version
-22.3.32 2023-02-14 19:38:03 UTC  Build id: 23acbda81a26 Edition: Community
+24.3.9 2024-09-26 18:01:32 UTC  Build id: 0d82533c492e Edition: Community
 ```
 
 To check the size of the storage shard:
@@ -98,16 +98,13 @@ $ docker run --rm -ti --link kvlite:store oracle/nosql:ce \
 
 Pinging components of store kvstore based upon topology sequence #14
 10 partitions and 1 storage nodes
-Time: 2023-02-27 06:25:43 UTC   Version: 22.3.32
+Time: 2024-12-04 11:50:35 UTC   Version: 24.3.9
 Shard Status: healthy: 1 writable-degraded: 0 read-only: 0 offline: 0 total: 1
 Admin Status: healthy
 Zone [name=KVLite id=zn1 type=PRIMARY allowArbiters=false masterAffinity=false]   RN Status: online: 1 read-only: 0 offline: 0
-Storage Node [sn1] on kvlite: 5000    Zone: [name=KVLite id=zn1 type=PRIMARY allowArbiters=false masterAffinity=false]    Status: RUNNING   Ver: 22.3.32 2023-02-14
-19:38:03 UTC  Build id: 23acbda81a26 Edition: Community    isMasterBalanced: true      serviceStartTime: 2023-02-27 06:24:27 UTC
-        Admin [admin1]          Status: RUNNING,MASTER  serviceStartTime: 2023-02-27 06:24:30 UTC       stateChangeTime: 2023-02-27 06:24:30 UTC        
-availableStorageSize: 2 GB
-        Rep Node [rg1-rn1]      Status: RUNNING,MASTER sequenceNumber: 314 haPort: 5011 availableStorageSize: 9 GB storageType: HD      
-serviceStartTime: 2023-02-27 06:24:33 UTC       stateChangeTime: 2023-02-27 06:24:34 UTC
+Storage Node [sn1] on kvlite: 5000    Zone: [name=KVLite id=zn1 type=PRIMARY allowArbiters=false masterAffinity=false]    Status: RUNNING   Ver: 24.3.9 2024-09-26 18:01:32 UTC  Build id: 0d82533c492e Edition: Community    isMasterBalanced: true     serviceStartTime: 2024-12-04 11:47:05 UTC
+        Admin [admin1]          Status: RUNNING,MASTER  serviceStartTime: 2024-12-04 11:47:08 UTC       stateChangeTime: 2024-12-04 11:47:08 UTC        availableStorageSize: 2 GB
+        Rep Node [rg1-rn1]      Status: RUNNING,MASTER sequenceNumber: 470 haPort: 5011 availableStorageSize: 9 GB storageType: HD      serviceStartTime: 2024-12-04 11:47:09 UTC       stateChangeTime: 2024-12-04 11:47:09 UTC
 
   kv-> put kv -key /SomeKey -value SomeValue
   Operation successful, record inserted.
@@ -126,13 +123,17 @@ $ docker run --rm -ti --link kvlite:store oracle/nosql:ce \
   tables
     SYS$IndexStatsLease
     SYS$MRTableAgentStat
+    SYS$MRTableInfo
     SYS$MRTableInitCheckpoint
     SYS$PartitionStatsLease
     SYS$SGAttributesTable
     SYS$StreamRequest
     SYS$StreamResponse
+    SYS$TableMetadata
     SYS$TableStatsIndex
     SYS$TableStatsPartition
+    SYS$TopologyHistory
+
   sql-> exit
 ```
 
@@ -175,7 +176,7 @@ be made via the Oracle NoSQL Database Proxy on the `KV_PROXY_PORT`.
 First, install the latest version of Oracle NoSQL on your remote host:
 
 ```shell
-KV_VERSION=22.3.32
+KV_VERSION=24.3.9
 rm -rf kv-$KV_VERSION
 DOWNLOAD_ROOT=http://download.oracle.com/otn-pub/otn_software/nosql-database
 DOWNLOAD_FILE="kv-ce-${KV_VERSION}.zip"
@@ -335,7 +336,7 @@ number used for the image tag:
 
 
 ```shell
-KV_VERSION=22.3.32 docker build --build-arg "$KV_VERSION" --tag "oracle/nosql-ce:$KV_VERSION" .
+KV_VERSION=24.3.9 docker build --build-arg "$KV_VERSION" --tag "oracle/nosql-ce:$KV_VERSION" .
 ```
 
 ## More information
@@ -358,9 +359,9 @@ Oracle provides no commercial support for the Oracle NoSQL Community Edition.
 
 ## Copyright
 
-Copyright (c) 2017, 2023 Oracle and/or its affiliates.
+Copyright (c) 2017, 2024 Oracle and/or its affiliates.
 
 [NOSQL]: http://www.oracle.com/technetwork/database/database-technologies/nosqldb/overview/index.html
 [DOCS]: https://docs.oracle.com/en/database/other-databases/nosql-database/index.html
-[Apache-2.0]: https://docs.oracle.com/en/database/other-databases/nosql-database/22.3/license/index.html#NSXLI-GUID-006E432E-1965-45A2-AEDE-204BD05E1560
+[Apache-2.0]: https://docs.oracle.com/en/database/other-databases/nosql-database/24.3/license/apache-license.html
 [GraalVM-License]: https://github.com/graalvm/container/blob/master/LICENSE.md

NoSQL/ce-sec/Dockerfile

@@ -1,11 +1,11 @@
-# Copyright (c) 2022, 2023 Oracle and/or its affiliates.
+# Copyright (c) 2022, 2024 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 #
-FROM ghcr.io/graalvm/jdk:ol8-java17
+FROM ghcr.io/graalvm/jdk:ol9-java17
 
 LABEL org.opencontainers.image.source = "https://github.com/oracle/docker-images"
 
-ARG KV_VERSION=22.3.32
+ARG KV_VERSION=24.3.9
 ARG DOWNLOAD_ROOT=http://download.oracle.com/otn-pub/otn_software/nosql-database
 ARG DOWNLOAD_FILE="kv-ce-${KV_VERSION}.zip"
 ARG DOWNLOAD_LINK="${DOWNLOAD_ROOT}/${DOWNLOAD_FILE}"
@@ -16,9 +16,10 @@ ENV KV_ADMIN_PORT 5999
 ENV KV_PORT 5000
 ENV KV_HARANGE 5010-5020
 ENV KV_SERVICERANGE 5021-5049
+ENV KV_ADDITIONAL_SAN=",DNS:proxy-nosql,DNS:kvlite-nosql-container-host"
 
 # specific to secure configuration
-RUN microdnf -y install openssl-1.1.1k && microdnf clean all
+RUN microdnf -y install openssl-3.0.1 && microdnf clean all
 
 # hadolint ignore=DL4006
 RUN useradd -d /kvroot  -m -s /bin/bash -u 1000 nosql-user && \