Skip to content

Commit 9518c73

Browse files
committed
Lint errors fix
1 parent 12653ba commit 9518c73

File tree

6 files changed

+9
-14
lines changed

6 files changed

+9
-14
lines changed

OracleSOASuite/dockerfiles/14.1.2.0/Containerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ENV FMW_JAR1=fmw_14.1.2.0.0_soa.jar \
2929
#
3030
# Copy installers and patches for install
3131
# -------------------------------------------
32-
ADD $FMW_JAR1 $FMW_JAR2 $FMW_JAR3 /u01/
32+
COPY $FMW_JAR1 $FMW_JAR2 $FMW_JAR3 /u01/
3333
RUN mkdir /u01/patches ${OPATCH_PATCH_DIR} && \
3434
chown oracle:root -R /u01
3535
COPY patches/* /u01/patches/
@@ -120,7 +120,7 @@ LABEL "provider"="Oracle"
120120
# -----------------------------
121121
USER root
122122
ENV PATH=$PATH:/u01/oracle/container-scripts:/u01/oracle/oracle_common/modules/thirdparty/org.apache.ant/apache-ant/bin
123-
RUN microdnf install hostname && \
123+
RUN microdnf install -y hostname && \
124124
microdnf clean all
125125

126126
COPY --from=builder --chown=oracle:root /u01 /u01

OracleSOASuite/dockerfiles/14.1.2.0/container-scripts/build.xml

100644100755
File mode changed.

OracleSOASuite/dockerfiles/14.1.2.0/container-scripts/createDomainAndStart.sh

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@ function _term() {
2626
exit;
2727
}
2828

29-
#==================================================
30-
function _kill() {
31-
echo "INFO: SIGKILL received, shutting down Admin Server!"
32-
/u01/oracle/user_projects/domains/base_domain/bin/stopWebLogic.sh
33-
exit;
34-
}
3529

3630
#==================================================
3731
function rand_pwd(){
@@ -57,7 +51,7 @@ setupRCU() {
5751
cp ${scrName} ${scrName}.orig
5852
fi
5953

60-
if [ "${dbType}" = "XE" -o "${dbType}" = "xe" ]; then
54+
if [ "${dbType}" = "XE" ] || [ "${dbType}" = "xe" ]; then
6155
echo "INFO: Setting RCU for XE"
6256
sed -e "s/^@@prepareAuditView.sql/-- @@prepareAuditView.sql/g" ${scrName}.orig > ${scrName}
6357
else
@@ -70,7 +64,8 @@ setupRCU() {
7064
updateListenAddress() {
7165
mkdir -p ${DOMAIN_HOME}/logs
7266

73-
export thehost=`hostname -I`
67+
thehost=`hostname -I`
68+
export thehost
7469
echo "INFO: Updating the listen address - ${thehost}"
7570
cmd="/u01/oracle/oracle_common/common/bin/wlst.sh -skipWLSModuleScanning /u01/oracle/container-scripts/updListenAddress.py $vol_name ${thehost} AdminServer"
7671
echo ${cmd}
@@ -82,7 +77,6 @@ updateListenAddress() {
8277
#==================================================
8378
trap _int SIGINT
8479
trap _term SIGTERM
85-
trap _kill SIGKILL
8680

8781
echo "INFO: CONNECTION_STRING = ${CONNECTION_STRING:?"Please set CONNECTION_STRING"}"
8882
echo "INFO: RCUPREFIX = ${RCUPREFIX:?"Please set RCUPREFIX"}"
@@ -109,7 +103,7 @@ then
109103
# Auto generate Oracle Database Schema password
110104
temp_pwd=$(rand_pwd)
111105
#Password should not start with a number for database
112-
f_str=`echo $temp_pwd|cut -c1|tr [0-9] [A-Z]`
106+
f_str=$(echo "$temp_pwd" | cut -c1 | tr '0-9' 'A-Z')
113107
s_str=`echo $temp_pwd|cut -c2-`
114108
DB_SCHEMA_PASSWORD=${f_str}${s_str}
115109
echo ""

OracleSOASuite/dockerfiles/14.1.2.0/container-scripts/get_healthcheck_url.sh

100644100755
File mode changed.

OracleSOASuite/dockerfiles/14.1.2.0/container-scripts/startMS.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ LOGDIR=${DOMAIN_HOME}/logs/${MANAGED_SERVER}
6262
LOGFILE=${LOGDIR}/ms.log
6363
mkdir -p ${LOGDIR}
6464

65-
export thehost=`hostname -I`
65+
thehost=`hostname -I`
66+
export thehost
6667
echo "INFO: Updating the listen address - ${thehost}"
6768
/u01/oracle/oracle_common/common/bin/wlst.sh -skipWLSModuleScanning /u01/oracle/container-scripts/updListenAddress.py $vol_name $thehost ${MANAGED_SERVER} > ${LOGDIR}/mslisten.log 2>&1
6869

OracleSOASuite/dockerfiles/buildDockerImage.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ fi
127127

128128

129129
# Go into version folder
130-
cd ${THEDIR}
130+
cd "${THEDIR}" || exit 1
131131

132132
checkFilePackages
133133
checksumPackages

0 commit comments

Comments
 (0)