Skip to content

misc: fix grammar and spelling #2955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 5, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This image is a specialized load balancer for doing [rolling, or canary deployme

This is an extended version of <a href="https://github.com/oracle/docker-images/tree/master/ContainerCloud/images/rolling-router">the original image</a> that supports session affinity. The sticky sessions module used is <a href="https://bitbucket.org/nginx-goodies/nginx-sticky-module-ng">nginx-sticky-module-ng</a>.

Besides the the Nginx module above this version adds a new key value <a href="https://github.com/mikarinneoracle/docker-images/blob/master/ContainerCloud/images/rolling-router/deploy_keyvalues.sh#L23">stickyness</a> and based on the value, either 0 or 1:
Besides the Nginx module above this version adds a new key value <a href="https://github.com/mikarinneoracle/docker-images/blob/master/ContainerCloud/images/rolling-router/deploy_keyvalues.sh#L23">stickyness</a> and based on the value, either 0 or 1:

<ol>
<li>First call from a client is load balanced based on <a href="https://github.com/mikarinneoracle/docker-images/blob/master/ContainerCloud/images/rolling-router/deploy_keyvalues.sh#L19">blendpercent</a> e.g. 10% (90/10 split)</li>
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ a discussion about the contribution to get feedback from other users.
All contributors are expected to adhere to our [code of conduct](CODE_OF_CONDUCT.md).

External contributions are only accepted from contributors who have signed the
[the Oracle Contributor Agreement](https://oca.opensource.oracle.com/) (OCA).
[Oracle Contributor Agreement](https://oca.opensource.oracle.com/) (OCA).
The [OCA Bot](https://github.com/apps/oracle-contributor-agreement) automatically
checks every pull request and will provide a link for you to follow to sign
the agreement if it can't find one for you.
Expand Down
2 changes: 1 addition & 1 deletion OracleDatabase/OracleConnectionManager/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ podman network create -d ipvlan --subnet=10.0.20.0/24 -o parent=ens5 rac_pub1_nw
If you want to use Jumbo Frames MTU Network Configuration as similar as with Oracle RAC containers networks, then refer [Jumbo Frames MTU Network Configuration](../OracleRealApplicationClusters/README.md#jumbo-frames-mtu-network-configuration) section

## How to deploy Oracle Connection Manager Container
The Oracle Connection manager container (CMAN) can be used with either an Oracle Real Application Clusters (Oracle RAC) database or with an Oracle Database Single instance database. However, you must ensure that the the SCAN Name or the Single host instance database Hostname is resolvable from the connection manager container.
The Oracle Connection manager container (CMAN) can be used with either an Oracle Real Application Clusters (Oracle RAC) database or with an Oracle Database Single instance database. However, you must ensure that the SCAN Name or the Single host instance database Hostname is resolvable from the connection manager container.
Oracle highly recommends that you use a DNS Server so that name resolution can happen successfully.

### Create Oracle Connection Manager Container
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# confirmations.
#Please note that the script would remove write permissions on the remote hosts
#for the user home directory and ~/.ssh directory for "group" and "others". This
# is an SSH requirement. The user would be explicitly informed about this by teh script and prompted to continue. In case the user presses no, the script would exit. In case the user does not want to be prompted, they can use the -confirm option.
# is an SSH requirement. The user would be explicitly informed about this by the script and prompted to continue. In case the user presses no, the script would exit. In case the user does not want to be prompted, they can use the -confirm option.
# As a part of the setup, the script would use SSH to create files within ~/.ssh
# directory of the remote node and to setup the requisite permissions. The
#script also uses SCP to copy the local host public key to the remote hosts so
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# confirmations.
#Please note that the script would remove write permissions on the remote hosts
#for the user home directory and ~/.ssh directory for "group" and "others". This
# is an SSH requirement. The user would be explicitly informed about this by teh script and prompted to continue. In case the user presses no, the script would exit. In case the user does not want to be prompted, they can use the -confirm option.
# is an SSH requirement. The user would be explicitly informed about this by the script and prompted to continue. In case the user presses no, the script would exit. In case the user does not want to be prompted, they can use the -confirm option.
# As a part of the setup, the script would use SSH to create files within ~/.ssh
# directory of the remote node and to setup the requisite permissions. The
#script also uses SCP to copy the local host public key to the remote hosts so
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# confirmations.
#Please note that the script would remove write permissions on the remote hosts
#for the user home directory and ~/.ssh directory for "group" and "others". This
# is an SSH requirement. The user would be explicitly informed about this by teh script and prompted to continue. In case the user presses no, the script would exit. In case the user does not want to be prompted, he can use -confirm option.
# is an SSH requirement. The user would be explicitly informed about this by the script and prompted to continue. In case the user presses no, the script would exit. In case the user does not want to be prompted, he can use -confirm option.
# As a part of the setup, the script would use SSH to create files within ~/.ssh
# directory of the remote node and to setup the requisite permissions. The
#script also uses SCP to copy the local host public key to the remote hosts so
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ podman create -t -i \
```
###### Section 2.1.2.2: Create Oracle RAC Containers
Now create the Oracle RAC containers using the image. For the details of environment variables, refer to [Environment Variables Explained](#section-9-environment-variables-for-oracle-rac-on-containers)
**Note**: Before creating the containers, you need to make sure you have edited teh file `/scratch/common_scripts/podman/rac/envfile_racnodep1` and set the variables based on your environment.
**Note**: Before creating the containers, you need to make sure you have edited the file `/scratch/common_scripts/podman/rac/envfile_racnodep1` and set the variables based on your environment.

You can use the following example to create the first Oracle RAC container:
```bash
Expand Down Expand Up @@ -236,7 +236,7 @@ podman create -t -i \
localhost/oracle/database-rac:21c-slim
```

**Note**: Before creating the containers, you need to make sure you have edited teh file `/scratch/common_scripts/podman/rac/envfile_racnodep2` and set the variables based on your enviornment.
**Note**: Before creating the containers, you need to make sure you have edited the file `/scratch/common_scripts/podman/rac/envfile_racnodep2` and set the variables based on your enviornment.

Create another Oracle RAC Container -

Expand Down Expand Up @@ -340,7 +340,7 @@ podman create -t -i \
localhost/oracle/database-rac:21c-slim
```

**Note**: Before creating the containers, you need to make sure you have edited teh file `/scratch/common_scripts/podman/rac/envfile_racnodep2` and set the variables based on your enviornment.
**Note**: Before creating the containers, you need to make sure you have edited the file `/scratch/common_scripts/podman/rac/envfile_racnodep2` and set the variables based on your enviornment.

To create another container, use the following command:

Expand Down Expand Up @@ -406,7 +406,7 @@ You can skip this step if you are planning not to use **User Defined Response Fi

Follow the below instructions to setup Oracle RAC on Podman using Slim Image for using user-defined response files.

**Note**: Before creating the containers, you need to make sure you have edited teh file `/scratch/common_scripts/podman/rac/envfile_racnodep1` and set the variables based on your enviornment.
**Note**: Before creating the containers, you need to make sure you have edited the file `/scratch/common_scripts/podman/rac/envfile_racnodep1` and set the variables based on your enviornment.

You can use the following example to create the first Oracle RAC container:
```bash
Expand Down Expand Up @@ -446,7 +446,7 @@ podman create -t -i \
localhost/oracle/database-rac:21c-slim
```

**Note**: Before creating the containers, you need to make sure you have edited teh file `/scratch/common_scripts/podman/rac/envfile_racnodep1` and set the variables based on your enviornment.
**Note**: Before creating the containers, you need to make sure you have edited the file `/scratch/common_scripts/podman/rac/envfile_racnodep1` and set the variables based on your enviornment.

To create another container, use the following command:

Expand Down Expand Up @@ -565,7 +565,7 @@ Refer to [README](./docs/CONNECTING.md) for instructions on how to connect to Or
Below is the example of adding 1 more node to the existing Oracle RAC 2 node cluster using Slim image and without user-defined files -
- Create envfile [envfile_racnodep3](withoutresponsefiles/blockdevices/envfile_racnodep3) for additional node and keep it here `/scratch/common_scripts/podman/rac/envfile_racnodep3`

**Note**: Before creating the containers, you need to make sure you have edited teh file `/scratch/common_scripts/podman/rac/envfile_racnodep3` and set the variables based on your enviornment.
**Note**: Before creating the containers, you need to make sure you have edited the file `/scratch/common_scripts/podman/rac/envfile_racnodep3` and set the variables based on your enviornment.

- Prepare Folder for additional node-
```bash
Expand Down Expand Up @@ -626,7 +626,7 @@ Below is the example of adding 1 more node to the existing Oracle RAC 2 node clu

### Section 8.1: Sample of Addition of Nodes to Oracle RAC Containers based on Oracle RAC Image Without Response File
Below is an example of adding one more node to the existing Oracle RAC 2 node cluster using the Oracle RAC image and without user-defined files.
**Note**: Before creating the containers, you need to make sure you have edited teh file `/scratch/common_scripts/podman/rac/envfile_racnodep3` and set the variables based on your enviornment.
**Note**: Before creating the containers, you need to make sure you have edited the file `/scratch/common_scripts/podman/rac/envfile_racnodep3` and set the variables based on your enviornment.

- Prepare directory for additional node-
```bash
Expand Down
2 changes: 1 addition & 1 deletion OracleDatabase/SingleInstance/FAQ.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ For such versions, if you require the runtime functionality documented in this r
## How do I change the timezone of my container

As of Docker 17.06-ce, Docker does not yet provide a way to pass down the `TZ` Unix environment variable from the host to the container. Because of that all containers run in the UTC timezone. If you would like to have your database run in a different timezone you can pass on the `TZ` environment variable within the `docker run` command via the `-e` option.
An example would be: `docker run ... -e TZ="Europe/Vienna" oracle/database:12.2.0.1-ee`. Another option would be to specify two read-only volume mounts: `docker run ... -v /etc/timezone:/etc/timezone:ro -v /etc/localtime:/etc/localtime:ro oracle/database:12.2.0.1-ee`. This will synchronize the timezone of the the container with that of the Docker host.
An example would be: `docker run ... -e TZ="Europe/Vienna" oracle/database:12.2.0.1-ee`. Another option would be to specify two read-only volume mounts: `docker run ... -v /etc/timezone:/etc/timezone:ro -v /etc/localtime:/etc/localtime:ro oracle/database:12.2.0.1-ee`. This will synchronize the timezone of the container with that of the Docker host.

## Can I run Oracle Database containers on Apple M1 (Arm) devices?

Expand Down