Skip to content

Commit aa5b93f

Browse files
committed
Updates for MOS patch download
1 parent 9f75ce1 commit aa5b93f

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

buildDBImage.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,5 +264,6 @@ processManifest ignore
264264

265265
DOCKER_BUILDKIT=$BUILDKIT docker build $options $arguments $secrets \
266266
--build-arg BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ') \
267+
--build-arg FORCE_PATCH=opatch \
267268
-t ${DB_REPO}:${ORACLE_VERSION}-${ORACLE_EDITION} \
268269
-f $dockerfile . && rm $dockerfile $dockerignore

manageOracle.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ installPatch() {
287287
# ...the patch file isn't present
288288
# ...or the FORCE_PATCH flag matches the patch type (all, opatch, patch) or the patch ID
289289
# ...the checksum in the patch manifest doesn't match the file
290-
local __checksum_result=$(checkSum "$INSTALL_DIR/patches/$install_file" "$checksum")
290+
local __checksum_result=$(checkSum "$INSTALL_DIR/patches/$install_file" "$checksum" >2/dev/null)
291291

292292
if [[ -f "/home/oracle/.netrc" && ( ! -f "$INSTALL_DIR/patches/$install_file" || "$(echo $FORCE_PATCH | grep -ci -e "\b$1\b" -e "\b$patchid\b" -e "\ball\b")" -eq 1 ) || "$__checksum_result" -ne 0 ]]
293293
then downloadPatch $patchid $INSTALL_DIR/patches $install_file

0 commit comments

Comments
 (0)