Skip to content

Commit 2f6a886

Browse files
committed
fix files
1 parent d0af650 commit 2f6a886

File tree

11 files changed

+27
-25
lines changed

11 files changed

+27
-25
lines changed

OracleDatabase/RAC/OracleRACStorageServer/README.md

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ Refer to the following instructions for setup of NFS Container for Oracle RAC:
99
- [How to build NFS Storage Container Image on Container host](#how-to-build-nfs-storage-container-image-on-container-host)
1010
- [Create Bridge Network](#create-bridge-network)
1111
- [NFS Server installation on Podman Host](#nfs-server-installation-on-podman-host)
12-
- [Running RACStorageServer Podman container](#running-racstorageserver-podman-container)
13-
- [Oracle RAC Storage Container for Podman Host](#rac-storage-container-for-podman-host)
14-
- [Oracle RAC Storage container for Docker Host](#rac-storage-container-for-docker-host)
12+
- [SELinux Configuration on Podman Host](#selinux-configuration-on-podman-host)
13+
- [Oracle RAC Storage Container for Podman Host](#oracle-rac-storage-container-for-podman-host)
14+
- [Oracle RAC Storage container for Docker Host](#oracle-rac-storage-container-for-docker-host)
1515
- [Create NFS Volume](#create-nfs-volume)
1616
- [Copyright](#copyright)
1717

@@ -57,7 +57,7 @@ Parameters:
5757
### Create Bridge Network
5858
Before creating the container, create the bridge public network for the NFS storage container.
5959

60-
The following are examples of creating `bridge`, `macvlan` or `ipvlan` [networks](#https://docs.podman.io/en/latest/markdown/podman-network-create.1.html).
60+
The following are examples of creating `bridge`, `macvlan` or `ipvlan` [networks](https://docs.podman.io/en/latest/markdown/podman-network-create.1.html).
6161

6262
Example of creating bridge networks:
6363
```bash
@@ -77,15 +77,14 @@ podman network create -d ipvlan --subnet=10.0.20.0/24 -o parent=ens5 rac_pub1_nw
7777

7878
### NFS Server installation on Podman Host
7979
To use NFS volumes in containers, you must install NFS server rpms on the Podman host. For example:
80-
8180
```bash
8281
dnf install -y nfs-utils
8382
```
8483

8584
### SELinux Configuration on Podman Host
8685
If SELinux is enabled on the Podman host then you must install another SELINUX module, specifically allowing permissions to write to the Podman host. To check if your SELinux is enabled or not, run the `getenforce` command.
8786

88-
Copy [rac-storage.te](./rac-storage.te) to `/var/opt` folder in your host and then execute below-
87+
Copy [rac-storage.te](./rac-storage.te) to `/var/opt` folder in your host and then execute below-
8988

9089
```bash
9190
cd /var/opt
@@ -98,13 +97,13 @@ Run the following command to create the container:
9897

9998
#### Prerequisites for RAC Storage Container for Podman Host
10099

101-
Create a placeholder for NFS storage and ensure that it is empty:
100+
Create a placeholder for NFS storage and ensure that it is empty:
102101
```bash
103102
export ORACLE_DBNAME=ORCLCDB
104103
mkdir -p /scratch/stage/rac-storage/$ORACLE_DBNAME
105104
rm -rf /scratch/stage/rac-storage/$ORACLE_DBNAME/asm_disk0*
106105
```
107-
If SELinux host is enabled on the machine, then run the following command:
106+
If SELinux host is enabled on the machine, then run the following command:
108107
```bash
109108
semanage fcontext -a -t container_file_t /scratch/stage/rac-storage/$ORACLE_DBNAME
110109
restorecon -v /scratch/stage/rac-storage/$ORACLE_DBNAME
@@ -199,7 +198,7 @@ You should see following in the Docker logs output:
199198
**IMPORTANT:** The NFS volume must be `/oradata`, which you will export to Oracle RAC containers for ASM storage. It will take approximately 10 minutes to set up the NFS server.
200199

201200
### Create NFS Volume
202-
#### Create NFS volume using the following command on the Podman Host:
201+
#### Create NFS volume using the following command on the Podman Host
203202

204203
```bash
205204
podman volume create --driver local \
@@ -209,7 +208,7 @@ podman volume create --driver local \
209208
racstorage
210209
```
211210

212-
#### Create NFS volume using following command on Docker Host:
211+
#### Create NFS volume using following command on Docker Host
213212

214213
```bash
215214
docker volume create --driver local \
@@ -220,7 +219,7 @@ racstorage
220219
```
221220
**IMPORTANT:** If you are not using the 192.168.17.0/24 subnet then you must change **addr=192.168.17.80** based on your environment.
222221

223-
# Environment variables explained
222+
## Environment variables explained
224223

225224
| Environment Variable | Description |
226225
|----------------------|-----------------|

OracleDatabase/RAC/OracleRACStorageServer/containerfiles/latest/Containerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,4 +60,5 @@ VOLUME ["/oradata"]
6060
WORKDIR /workdir
6161

6262
# Define default command to start Oracle Database.
63+
# hadolint ignore=DL3025
6364
ENTRYPOINT /usr/bin/$INITSH

OracleDatabase/RAC/OracleRealApplicationClusters/containerfiles/19.3.0/Containerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -190,16 +190,16 @@ RUN chmod 755 $INSTALL_SCRIPTS/*.sh && \
190190
# Start new stage for installing the grid and DB
191191
# -------------------------------------------
192192
#############################################
193-
193+
# hadolint ignore=DL3006
194194
FROM rac-image-slim-${SLIMMING} AS builder
195195
ARG SLIMMING
196196
# hadolint ignore=DL3006
197197
ARG VERSION
198198
COPY $VERSION/$INSTALL_GRID_BINARIES_FILE $VERSION/$GRID_SW_INSTALL_RSP $VERSION/$DB_SETUP_FILE $VERSION/$DB_INSTALL_RSP $VERSION/$INSTALL_DB_BINARIES_FILE $VERSION/$ENABLE_RAC_FILE $VERSION/$GRID_HOME_CLEANUP $VERSION/$ORACLE_HOME_CLEANUP $VERSION/$INSTALL_FILE_1* $VERSION/$INSTALL_FILE_2* $INSTALL_SCRIPTS/
199-
200-
RUN chmod 755 $INSTALL_SCRIPTS/*.sh
201199
# hadolint ignore=SC2086
200+
RUN chmod 755 $INSTALL_SCRIPTS/*.sh
202201
## Install software if SLIMMING is false
202+
# hadolint ignore=SC2086
203203
RUN if [ "${SLIMMING}x" != 'truex' ]; then \
204204
sed -e '/hard *memlock/s/^/#/g' -i /etc/security/limits.d/oracle-database-preinstall-19c.conf && \
205205
sed -e '/ *nofile /s/^/#/g' -i /etc/security/limits.d/oracle-database-preinstall-19c.conf && \
@@ -228,7 +228,7 @@ RUN rm -f $INSTALL_DIR/install/* && \
228228
# Start new layer for grid & database runtime
229229
# -------------------------------------------
230230
#############################################
231-
231+
# hadolint ignore=DL3006
232232
FROM rac-image-slim-${SLIMMING} AS final
233233
# hadolint ignore=DL3006
234234
COPY --from=builder /u01 /u01

OracleDatabase/RAC/OracleRealApplicationClusters/containerfiles/19.3.0/applyGridPatch.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ if [ "$GRID_HOME" == "" ]; then
3434
fi;
3535

3636
# Install Oracle binaries
37-
37+
# shellcheck disable=SC2115
3838
unzip -q "$INSTALL_SCRIPTS"/"$PATCH" -d "$GRID_USER_HOME" && \
3939
rm -f "$INSTALL_SCRIPTS"/"$GRID_PATCH" && \
4040
cd "$GRID_USER_HOME"/"$PATCH_NUMBER"/"$PATCH_NUMBER" && \

OracleDatabase/RAC/OracleRealApplicationClusters/containerfiles/19.3.0/installGridBinaries.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#
1212

1313
EDITION=$1
14+
# shellcheck disable=SC2034
1415
PATCH_NUMBER=$2
1516

1617
# Check whether edition has been passed on

OracleDatabase/RAC/OracleRealApplicationClusters/containerfiles/19.3.0/runOracle.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ fi
3333
if [ -z ${EXECUTOR} ]; then
3434
EXECUTOR="python3"
3535
fi
36-
36+
# shellcheck disable=SC2164
3737
cd $BASE_DIR
3838
$EXECUTOR $SCRIPT_NAME
3939

OracleDatabase/RAC/OracleRealApplicationClusters/containerfiles/21.3.0/Containerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,16 +188,16 @@ RUN chmod 755 $INSTALL_SCRIPTS/*.sh && \
188188
# Start new stage for installing the grid and DB
189189
# -------------------------------------------
190190
#############################################
191-
191+
# hadolint ignore=DL3006
192192
FROM rac-image-slim-${SLIMMING} AS builder
193193
ARG SLIMMING
194194
# hadolint ignore=DL3006
195195
ARG VERSION
196196
COPY $VERSION/$INSTALL_GRID_BINARIES_FILE $VERSION/$GRID_SW_INSTALL_RSP $VERSION/$DB_SETUP_FILE $VERSION/$DB_INSTALL_RSP $VERSION/$INSTALL_DB_BINARIES_FILE $VERSION/$ENABLE_RAC_FILE $VERSION/$GRID_HOME_CLEANUP $VERSION/$ORACLE_HOME_CLEANUP $VERSION/$INSTALL_FILE_1* $VERSION/$INSTALL_FILE_2* $INSTALL_SCRIPTS/
197-
198-
RUN chmod 755 $INSTALL_SCRIPTS/*.sh
199197
# hadolint ignore=SC2086
198+
RUN chmod 755 $INSTALL_SCRIPTS/*.sh
200199
## Install software if SLIMMING is false
200+
# hadolint ignore=SC2086
201201
RUN if [ "${SLIMMING}x" != 'truex' ]; then \
202202
sed -e '/hard *memlock/s/^/#/g' -i /etc/security/limits.d/oracle-database-preinstall-21c.conf && \
203203
sed -e '/ *nofile /s/^/#/g' -i /etc/security/limits.d/oracle-database-preinstall-21c.conf && \
@@ -226,7 +226,7 @@ RUN rm -f $INSTALL_DIR/install/* && \
226226
# Start new layer for grid & database runtime
227227
# -------------------------------------------
228228
#############################################
229-
229+
# hadolint ignore=DL3006
230230
FROM rac-image-slim-${SLIMMING} AS final
231231
# hadolint ignore=DL3006
232232
COPY --from=builder /u01 /u01

OracleDatabase/RAC/OracleRealApplicationClusters/containerfiles/21.3.0/applyGridPatch.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ if [ "$GRID_HOME" == "" ]; then
3434
fi;
3535

3636
# Install Oracle binaries
37-
37+
# shellcheck disable=SC2115
3838
unzip -q "$INSTALL_SCRIPTS"/"$PATCH" -d "$GRID_USER_HOME" && \
3939
rm -f "$INSTALL_SCRIPTS"/"$GRID_PATCH" && \
4040
cd "$GRID_USER_HOME"/"$PATCH_NUMBER"/"$PATCH_NUMBER" && \

OracleDatabase/RAC/OracleRealApplicationClusters/containerfiles/21.3.0/installGridBinaries.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#
1212

1313
EDITION=$1
14+
# shellcheck disable=SC2034
1415
PATCH_NUMBER=$2
1516

1617
# Check whether edition has been passed on

OracleDatabase/RAC/OracleRealApplicationClusters/containerfiles/21.3.0/runOracle.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ fi
3333
if [ -z ${EXECUTOR} ]; then
3434
EXECUTOR="python3"
3535
fi
36-
36+
# shellcheck disable=SC2164
3737
cd $BASE_DIR
3838
$EXECUTOR $SCRIPT_NAME
3939

0 commit comments

Comments
 (0)