Skip to content

Commit 77639fa

Browse files
committed
Lint errors fix
1 parent b68988c commit 77639fa

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

OracleSOASuite/dockerfiles/14.1.2.0/Containerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ RUN mkdir /u01/patches ${OPATCH_PATCH_DIR} && \
3535
COPY patches/* /u01/patches/
3636
COPY opatch_patch/* ${OPATCH_PATCH_DIR}/
3737
COPY container-scripts/* /u01/oracle/container-scripts/
38-
# hadolint ignore=DL3003
39-
RUN cd /u01 && chmod 755 *.jar && \
38+
RUN cd /u01 && chmod 755 ./*.jar && \
4039
chmod +xr /u01/oracle/container-scripts/*.*
4140

4241
#

OracleSOASuite/dockerfiles/buildDockerImage.sh

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ checksumPackages() {
5858
echo "INFO: Checking if required packages are valid..."
5959

6060
md5sum --quiet -c install/soasuite.download 2> /dev/null
61-
if [ "$?" -ne 0 ]; then
61+
rc=$?
62+
if [ "$rc" -ne 0 ]; then
6263
cat <<EOF
6364
6465
ERROR: MD5 for required packages to build the ${VERSION}
@@ -67,7 +68,7 @@ ERROR: MD5 for required packages to build the ${VERSION}
6768
EOF
6869
cat install/soasuite.download
6970
echo " "
70-
exit $?
71+
exit $rc
7172
fi
7273
}
7374

@@ -133,15 +134,15 @@ checkFilePackages
133134
checksumPackages
134135

135136
# Proxy settings - Set your own proxy environment
136-
if [ "${http_proxy}" != "" ]; then
137+
if [ "${http_proxy:-}" != "" ]; then
137138
PROXY_SETTINGS="--build-arg http_proxy=${http_proxy}"
138139
fi
139140

140-
if [ "${https_proxy}" != "" ]; then
141+
if [ "${https_proxy:-}" != "" ]; then
141142
PROXY_SETTINGS="$PROXY_SETTINGS --build-arg https_proxy=${https_proxy}"
142143
fi
143144

144-
if [ "${no_proxy}" != "" ]; then
145+
if [ "${no_proxy:-}" != "" ]; then
145146
PROXY_SETTINGS="$PROXY_SETTINGS --build-arg no_proxy=${no_proxy}"
146147
fi
147148

0 commit comments

Comments
 (0)