Skip to content

Commit 488aff2

Browse files
committed
Remove references to the preupgrade.jar from MOS to simplify this example.
1 parent 4295659 commit 488aff2

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

database/ol7_121_122/Dockerfile

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ ENV ORACLE_BASE=/u01/app/oracle \
4141
ORA_INVENTORY=/u01/app/oraInventory \
4242
SOFTWARE_DIR=/u01/software \
4343
DB_SOFTWARE="linuxx64_12201_database.zip" \
44-
PREUPGRADE_SOFTWARE="preupgrade_12201_cbuild_20_lf.zip" \
4544
ORACLE_PASSWORD="oracle" \
4645
SCRIPTS_DIR=/u01/scripts \
4746
ORAENV_ASK=NO
@@ -63,11 +62,6 @@ COPY scripts/* ${SCRIPTS_DIR}/
6362
# ------------------------------------------------------------------------------
6463
# Unpack all the software and remove the media.
6564
# No config done in the build phase.
66-
#
67-
# Manually create user and group as preinstall package creates the with
68-
# high IDs, which causes issues. Note 2 on link below.
69-
# https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/#user
70-
#
7165
USER root
7266

7367
RUN mkdir -p ${ORACLE_HOME_2} && \
@@ -107,10 +101,7 @@ RUN ${SOFTWARE_DIR}/database/runInstaller -ignoreSysPrereqs -ignorePrereq \
107101
DECLINE_SECURITY_UPDATES=true
108102

109103
# Remove source software and put the latest "preupgrade.jar" file in place.
110-
RUN rm -Rf ${SOFTWARE_DIR}/database && \
111-
cd ${ORACLE_HOME_2}/rdbms/admin/ && \
112-
mv ${SOFTWARE_DIR}/${PREUPGRADE_SOFTWARE} ./${PREUPGRADE_SOFTWARE} && \
113-
unzip -oq ${PREUPGRADE_SOFTWARE}
104+
RUN rm -Rf ${SOFTWARE_DIR}/database
114105

115106
# Run the root scripts
116107
USER root

0 commit comments

Comments
 (0)