Skip to content

Commit 6ed3e05

Browse files
dario-vegadario-vega
and
dario-vega
authored
NOSQL - Update to version 24.3.9 (#2892)
* NOSQL - Update to version 24.3.9 * Update to fix lint check error * Executable for setup-http-proxy-sec script --------- Co-authored-by: dario-vega <[email protected]>
1 parent 5846bb2 commit 6ed3e05

File tree

5 files changed

+41
-30
lines changed

5 files changed

+41
-30
lines changed

NoSQL/README-sec.md

+15-11
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ This container image uses a simplified version of the Oracle NoSQL Database call
1414

1515
This container image configures an Oracle NoSQL Database secure configuration
1616
1. Create a KVlite secured configuration with the
17-
[password complexity policy](https://docs.oracle.com/en/database/other-databases/nosql-database/22.1/security/password-complexity-policies.html)
17+
[password complexity policy](https://docs.oracle.com/en/database/other-databases/nosql-database/24.3/security/password-complexity-policies.html)
1818
enabled
1919
2. Create the `root` user and the file `user.security` that contain property settings for the login as admin
2020
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:
8686

8787
```shell
8888
$ docker run --rm -ti --link kvlite:store oracle/nosql:ce-sec java -Xmx64m -Xms64m -jar lib/kvstore.jar version
89-
23.3.32 2024-03-06 18:21:38 UTC Build id: 69f48431fc69 Edition: Community
89+
24.3.9 2024-09-26 18:01:32 UTC Build id: 0d82533c492e Edition: Community
9090
```
9191

9292
To check the size of the storage shard:
@@ -113,13 +113,13 @@ $ docker run --rm -ti -v secfiles:/shared_conf:ro --link kvlite:store oracle/nos
113113

114114
Pinging components of store kvstore based upon topology sequence #14
115115
10 partitions and 1 storage nodes
116-
Time: 2024-04-25 08:13:14 UTC Version: 23.3.32
116+
Time: 2024-12-04 12:14:44 UTC Version: 24.3.9
117117
Shard Status: healthy: 1 writable-degraded: 0 read-only: 0 offline: 0 total: 1
118118
Admin Status: healthy
119119
Zone [name=KVLite id=zn1 type=PRIMARY allowArbiters=false masterAffinity=false] RN Status: online: 1 read-only: 0 offline: 0
120-
Storage Node [sn1] on kvlite: 5000 Zone: [name=KVLite id=zn1 type=PRIMARY allowArbiters=false masterAffinity=false] Status: RUNNING Ver: 23.3.32 2024-03-06 18:21:38 UTC Build id: 69f48431fc69 Edition: Community isMasterBalanced: true serviceStartTime: 2024-04-25 08:10:10 UTC
121-
Admin [admin1] Status: RUNNING,MASTER serviceStartTime: 2024-04-25 08:10:13 UTC stateChangeTime: 2024-04-25 08:10:13 UTC availableStorageSize: 2 GB
122-
Rep Node [rg1-rn1] Status: RUNNING,MASTER sequenceNumber: 86 haPort: 5011 availableStorageSize: 9 GB storageType: HD serviceStartTime: 2024-04-25 08:10:14 UTC stateChangeTime: 2024-04-25 08:10:15 UTC
120+
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
121+
Admin [admin1] Status: RUNNING,MASTER serviceStartTime: 2024-12-04 12:06:47 UTC stateChangeTime: 2024-12-04 12:06:47 UTC availableStorageSize: 2 GB
122+
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
123123

124124

125125
kv-> put kv -key /SomeKey -value SomeValue
@@ -140,13 +140,17 @@ $ docker run --rm -ti -v secfiles:/shared_conf:ro --link kvlite:store oracle/nos
140140
tables
141141
SYS$IndexStatsLease
142142
SYS$MRTableAgentStat
143+
SYS$MRTableInfo
143144
SYS$MRTableInitCheckpoint
144145
SYS$PartitionStatsLease
145146
SYS$SGAttributesTable
146147
SYS$StreamRequest
147148
SYS$StreamResponse
149+
SYS$TableMetadata
148150
SYS$TableStatsIndex
149151
SYS$TableStatsPartition
152+
SYS$TopologyHistory
153+
150154
sql-> exit
151155
```
152156

@@ -202,7 +206,7 @@ $ openssl x509 -text -noout -in /mylocalpath/certificate.pem | grep CN
202206
203207
````
204208
Note: the certicate can be customized in the script setup-http-proxy-sec.sh
205-
(e.g adding [SAN](https://docs.oracle.com/en/database/other-databases/nosql-database/23.1/security/ssl-using-openssl.html))
209+
(e.g adding [SAN](https://docs.oracle.com/en/database/other-databases/nosql-database/24.3/security/ssl-using-openssl.html))
206210
207211
## Advanced Scenario: connecting to Oracle NoSQL CE from another host
208212
@@ -217,10 +221,10 @@ be made via the Oracle NoSQL Database Proxy on the `KV_PROXY_PORT`.
217221
First, install the latest version of Oracle NoSQL on your remote host:
218222
219223
```shell
220-
KV_VERSION=23.3.32
224+
KV_VERSION=24.3.9
221225
rm -rf kv-$KV_VERSION
222226
DOWNLOAD_ROOT=http://download.oracle.com/otn-pub/otn_software/nosql-database
223-
DOWNLOAD_FILE="community-edition-${KV_VERSION}.zip"
227+
DOWNLOAD_FILE="kv-ce-${KV_VERSION}.zip"
224228
DOWNLOAD_LINK="${DOWNLOAD_ROOT}/${DOWNLOAD_FILE}"
225229
curl -OLs $DOWNLOAD_LINK
226230
jar tf $DOWNLOAD_FILE | grep "kv-$KV_VERSION/lib" > extract.libs
@@ -400,7 +404,7 @@ number used for the image tag:
400404
401405
402406
```shell
403-
KV_VERSION=23.3.32 docker build --build-arg "$KV_VERSION" --tag "oracle/nosql-ce-sec:$KV_VERSION" .
407+
KV_VERSION=24.3.9 docker build --build-arg "$KV_VERSION" --tag "oracle/nosql-ce-sec:$KV_VERSION" .
404408
```
405409
406410
## More information
@@ -427,5 +431,5 @@ Copyright (c) 2017, 2024 Oracle and/or its affiliates.
427431
428432
[NOSQL]: http://www.oracle.com/technetwork/database/database-technologies/nosqldb/overview/index.html
429433
[DOCS]: https://docs.oracle.com/en/database/other-databases/nosql-database/index.html
430-
[Apache-2.0]: https://docs.oracle.com/en/database/other-databases/nosql-database/23.3/license/index.html#GUID-006E432E-1965-45A2-AEDE-204BD05E1560
434+
[Apache-2.0]: https://docs.oracle.com/en/database/other-databases/nosql-database/24.3/license/apache-license.html
431435
[GraalVM-License]: https://github.com/graalvm/container/blob/master/LICENSE.md

NoSQL/README.md

+13-9
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ For example, to check the version of KVLite, use the `version` command:
7373

7474
```shell
7575
$ docker run --rm -ti --link kvlite:store oracle/nosql:ce java -Xmx64m -Xms64m -jar lib/kvstore.jar version
76-
23.3.32 2024-03-06 18:21:38 UTC Build id: 69f48431fc69 Edition: Community
76+
24.3.9 2024-09-26 18:01:32 UTC Build id: 0d82533c492e Edition: Community
7777
```
7878

7979
To check the size of the storage shard:
@@ -98,13 +98,13 @@ $ docker run --rm -ti --link kvlite:store oracle/nosql:ce \
9898

9999
Pinging components of store kvstore based upon topology sequence #14
100100
10 partitions and 1 storage nodes
101-
Time: 2024-04-25 08:13:14 UTC Version: 23.3.32
101+
Time: 2024-12-04 11:50:35 UTC Version: 24.3.9
102102
Shard Status: healthy: 1 writable-degraded: 0 read-only: 0 offline: 0 total: 1
103103
Admin Status: healthy
104104
Zone [name=KVLite id=zn1 type=PRIMARY allowArbiters=false masterAffinity=false] RN Status: online: 1 read-only: 0 offline: 0
105-
Storage Node [sn1] on kvlite: 5000 Zone: [name=KVLite id=zn1 type=PRIMARY allowArbiters=false masterAffinity=false] Status: RUNNING Ver: 23.3.32 2024-03-06 18:21:38 UTC Build id: 69f48431fc69 Edition: Community isMasterBalanced: true serviceStartTime: 2024-04-25 08:10:10 UTC
106-
Admin [admin1] Status: RUNNING,MASTER serviceStartTime: 2024-04-25 08:10:13 UTC stateChangeTime: 2024-04-25 08:10:13 UTC availableStorageSize: 2 GB
107-
Rep Node [rg1-rn1] Status: RUNNING,MASTER sequenceNumber: 86 haPort: 5011 availableStorageSize: 9 GB storageType: HD serviceStartTime: 2024-04-25 08:10:14 UTC stateChangeTime: 2024-04-25 08:10:15 UTC
105+
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
106+
Admin [admin1] Status: RUNNING,MASTER serviceStartTime: 2024-12-04 11:47:08 UTC stateChangeTime: 2024-12-04 11:47:08 UTC availableStorageSize: 2 GB
107+
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
108108

109109
kv-> put kv -key /SomeKey -value SomeValue
110110
Operation successful, record inserted.
@@ -123,13 +123,17 @@ $ docker run --rm -ti --link kvlite:store oracle/nosql:ce \
123123
tables
124124
SYS$IndexStatsLease
125125
SYS$MRTableAgentStat
126+
SYS$MRTableInfo
126127
SYS$MRTableInitCheckpoint
127128
SYS$PartitionStatsLease
128129
SYS$SGAttributesTable
129130
SYS$StreamRequest
130131
SYS$StreamResponse
132+
SYS$TableMetadata
131133
SYS$TableStatsIndex
132134
SYS$TableStatsPartition
135+
SYS$TopologyHistory
136+
133137
sql-> exit
134138
```
135139

@@ -172,10 +176,10 @@ be made via the Oracle NoSQL Database Proxy on the `KV_PROXY_PORT`.
172176
First, install the latest version of Oracle NoSQL on your remote host:
173177

174178
```shell
175-
KV_VERSION=23.3.32
179+
KV_VERSION=24.3.9
176180
rm -rf kv-$KV_VERSION
177181
DOWNLOAD_ROOT=http://download.oracle.com/otn-pub/otn_software/nosql-database
178-
DOWNLOAD_FILE="community-edition-${KV_VERSION}.zip"
182+
DOWNLOAD_FILE="kv-ce-${KV_VERSION}.zip"
179183
DOWNLOAD_LINK="${DOWNLOAD_ROOT}/${DOWNLOAD_FILE}"
180184
curl -OLs $DOWNLOAD_LINK
181185
jar tf $DOWNLOAD_FILE | grep "kv-$KV_VERSION/lib" > extract.libs
@@ -332,7 +336,7 @@ number used for the image tag:
332336

333337

334338
```shell
335-
KV_VERSION=23.3.32 docker build --build-arg "$KV_VERSION" --tag "oracle/nosql-ce:$KV_VERSION" .
339+
KV_VERSION=24.3.9 docker build --build-arg "$KV_VERSION" --tag "oracle/nosql-ce:$KV_VERSION" .
336340
```
337341

338342
## More information
@@ -359,5 +363,5 @@ Copyright (c) 2017, 2024 Oracle and/or its affiliates.
359363

360364
[NOSQL]: http://www.oracle.com/technetwork/database/database-technologies/nosqldb/overview/index.html
361365
[DOCS]: https://docs.oracle.com/en/database/other-databases/nosql-database/index.html
362-
[Apache-2.0]: https://docs.oracle.com/en/database/other-databases/nosql-database/23.3/license/index.html#GUID-006E432E-1965-45A2-AEDE-204BD05E1560
366+
[Apache-2.0]: https://docs.oracle.com/en/database/other-databases/nosql-database/24.3/license/apache-license.html
363367
[GraalVM-License]: https://github.com/graalvm/container/blob/master/LICENSE.md

NoSQL/ce-sec/Dockerfile

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Copyright (c) 2022, 2024 Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
33
#
4-
FROM ghcr.io/graalvm/jdk:ol8-java17
4+
FROM ghcr.io/graalvm/jdk:ol9-java17
55

66
LABEL org.opencontainers.image.source = "https://github.com/oracle/docker-images"
77

8-
ARG KV_VERSION=23.3.32
8+
ARG KV_VERSION=24.3.9
99
ARG DOWNLOAD_ROOT=http://download.oracle.com/otn-pub/otn_software/nosql-database
10-
ARG DOWNLOAD_FILE="community-edition-${KV_VERSION}.zip"
10+
ARG DOWNLOAD_FILE="kv-ce-${KV_VERSION}.zip"
1111
ARG DOWNLOAD_LINK="${DOWNLOAD_ROOT}/${DOWNLOAD_FILE}"
1212

1313
ENV KV_PROXY_PORT 8080
@@ -16,9 +16,10 @@ ENV KV_ADMIN_PORT 5999
1616
ENV KV_PORT 5000
1717
ENV KV_HARANGE 5010-5020
1818
ENV KV_SERVICERANGE 5021-5049
19+
ENV KV_ADDITIONAL_SAN=",DNS:proxy-nosql,DNS:kvlite-nosql-container-host"
1920

2021
# specific to secure configuration
21-
RUN microdnf -y install openssl-1.1.1k && microdnf clean all
22+
RUN microdnf -y install openssl-3.0.1 && microdnf clean all
2223

2324
# hadolint ignore=DL4006
2425
RUN useradd -d /kvroot -m -s /bin/bash -u 1000 nosql-user && \

NoSQL/ce-sec/sec/setup-http-proxy-sec.sh

100644100755
+5-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
#! /bin/bash
22
#
3-
# Copyright (c) 2022 Oracle and/or its affiliates.
3+
# Copyright (c) 2022, 2024 Oracle and/or its affiliates.
44
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
55

6+
set -e
7+
68
if [ -d /kvroot/proxy/ ] ; then
79
echo "Reusing existing configuration"
810
exit 0;
@@ -11,7 +13,7 @@ fi
1113
mkdir -p /kvroot/proxy/
1214

1315
echo "Creating password"
14-
TMPPWD="$(gpg --gen-random --armor 2 8)$(gpg --gen-random --armor 2 8)"
16+
TMPPWD="$(gpg --gen-random --armor 2 8)12$(gpg --gen-random --armor 2 8)"
1517

1618
echo "Creating USER proxy_user"
1719

@@ -40,7 +42,7 @@ openssl req -x509 -days 365 -newkey rsa:4096 -keyout /kvroot/proxy/key.pem -out
4042
<(echo "[req]";
4143
echo distinguished_name=req;
4244
echo "[san]";
43-
echo "subjectAltName=DNS:${HOSTNAME},DNS:localhost,DNS:proxy-nosql,DNS:kvlite-nosql-container-host"
45+
echo "subjectAltName=DNS:${HOSTNAME},DNS:localhost${KV_ADDITIONAL_SAN}"
4446
)
4547
openssl pkcs8 -topk8 -inform PEM -outform PEM -in /kvroot/proxy/key.pem -out /kvroot/proxy/key-pkcs8.pem -passin file:/kvroot/proxy/pwdin -passout file:/kvroot/proxy/pwdout -v1 PBE-SHA1-3DES
4648
keytool -import -alias example -keystore /kvroot/proxy/driver.trust -file /kvroot/proxy/certificate.pem -storepass "$(cat /kvroot/proxy/pwdin)" -noprompt

NoSQL/ce/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Copyright (c) 2022, 2024 Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
33
#
4-
FROM ghcr.io/graalvm/jdk:ol8-java17
4+
FROM ghcr.io/graalvm/jdk:ol9-java17
55

66
LABEL org.opencontainers.image.source = "https://github.com/oracle/docker-images"
77

8-
ARG KV_VERSION=23.3.32
8+
ARG KV_VERSION=24.3.9
99
ARG DOWNLOAD_ROOT=http://download.oracle.com/otn-pub/otn_software/nosql-database
10-
ARG DOWNLOAD_FILE="community-edition-${KV_VERSION}.zip"
10+
ARG DOWNLOAD_FILE="kv-ce-${KV_VERSION}.zip"
1111
ARG DOWNLOAD_LINK="${DOWNLOAD_ROOT}/${DOWNLOAD_FILE}"
1212

1313
ENV KV_PROXY_PORT 8080

0 commit comments

Comments
 (0)