Skip to content

fix size of images #2971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 7, 2025
Merged

fix size of images #2971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e45c4f6
fix size of images
s1saurabh May 7, 2025
efb6344
Merge branch 'main' into sizefix
s1saurabh May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion OracleDatabase/RAC/OracleRealApplicationClusters/containerfiles/19.3.0/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ RUN chmod 755 $INSTALL_SCRIPTS/*.sh && \
$INSTALL_DIR/install/$SETUP_LINUX_FILE && \
$INSTALL_DIR/install/$GRID_SETUP_FILE && \
$INSTALL_DIR/install/$DB_SETUP_FILE && \
rm -rf $DB_HOME/.patch_storage $DB_HOME/.opatchauto_storage $GRID_HOME/.patch_storage $GRID_HOME/.opatchauto_storage && \
sync

#############################################
Expand Down Expand Up @@ -171,6 +172,7 @@ RUN chmod 755 $INSTALL_SCRIPTS/*.sh && \
$INSTALL_DIR/install/$SETUP_LINUX_FILE && \
$INSTALL_DIR/install/$GRID_SETUP_FILE && \
$INSTALL_DIR/install/$DB_SETUP_FILE && \
rm -rf $DB_HOME/.patch_storage $DB_HOME/.opatchauto_storage $GRID_HOME/.patch_storage $GRID_HOME/.opatchauto_storage && \
sync


Expand All @@ -184,9 +186,15 @@ FROM rac-image-slim-${SLIMMING} AS builder
ARG SLIMMING
# hadolint ignore=DL3006
ARG VERSION
# Linux Env Variable
ENV GRID_BASE=/u01/app/grid \
GRID_HOME=/u01/app/19c/grid \
DB_BASE=/u01/app/oracle \
DB_HOME=/u01/app/oracle/product/19c/dbhome_1
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/
# hadolint ignore=SC2086
RUN chmod 755 $INSTALL_SCRIPTS/*.sh
RUN chmod 755 $INSTALL_SCRIPTS/*.sh && \
rm -rf $DB_HOME/.patch_storage $DB_HOME/.opatchauto_storage $GRID_HOME/.patch_storage $GRID_HOME/.opatchauto_storage

## Install software if SLIMMING is false
# hadolint ignore=SC2086
Expand All @@ -202,6 +210,7 @@ RUN if [ "${SLIMMING}x" != 'truex' ]; then \
$DB_HOME/root.sh && \
su $GRID_USER -c "$INSTALL_SCRIPTS/$GRID_HOME_CLEANUP" && \
su $DB_USER -c "$INSTALL_SCRIPTS/$ORACLE_HOME_CLEANUP" && \
rm -rf $DB_HOME/.patch_storage $DB_HOME/.opatchauto_storage $GRID_HOME/.patch_storage $GRID_HOME/.opatchauto_storage && \
:; \
fi
# hadolint ignore=SC3014
Expand All @@ -211,6 +220,7 @@ RUN if [ "${SLIMMING}x" == 'truex' ]; then \
fi
# hadolint ignore=SC2086
RUN rm -f $INSTALL_DIR/install/* && \
rm -rf $DB_HOME/.patch_storage $DB_HOME/.opatchauto_storage $GRID_HOME/.patch_storage $GRID_HOME/.opatchauto_storage && \
sync

#############################################
Expand All @@ -220,6 +230,11 @@ RUN rm -f $INSTALL_DIR/install/* && \
#############################################
# hadolint ignore=DL3006
FROM rac-image-slim-${SLIMMING} AS final
ENV GRID_BASE=/u01/app/grid \
GRID_HOME=/u01/app/19c/grid \
DB_BASE=/u01/app/oracle \
DB_HOME=/u01/app/oracle/product/19c/dbhome_1
RUN rm -rf $DB_HOME/.patch_storage $DB_HOME/.opatchauto_storage $GRID_HOME/.patch_storage $GRID_HOME/.opatchauto_storage
# hadolint ignore=DL3006
COPY --from=builder /u01 /u01
# hadolint ignore=SC2086
Expand All @@ -245,6 +260,7 @@ RUN if [ "${SLIMMING}x" != 'truex' ]; then \
rm -f /etc/sysctl.d/99-oracle-database-preinstall-19c-sysctl.conf && \
rm -f /etc/sysctl.d/99-sysctl.conf && \
rm -f $INSTALL_DIR/install/* && \
rm -rf $DB_HOME/.patch_storage $DB_HOME/.opatchauto_storage $GRID_HOME/.patch_storage $GRID_HOME/.opatchauto_storage && \
sync

USER ${USER}
Expand Down
21 changes: 19 additions & 2 deletions OracleDatabase/RAC/OracleRealApplicationClusters/containerfiles/21.3.0/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ RUN chmod 755 $INSTALL_SCRIPTS/*.sh && \
$INSTALL_DIR/install/$SETUP_LINUX_FILE && \
$INSTALL_DIR/install/$GRID_SETUP_FILE && \
$INSTALL_DIR/install/$DB_SETUP_FILE && \
rm -rf $DB_HOME/.patch_storage $DB_HOME/.opatchauto_storage $GRID_HOME/.patch_storage $GRID_HOME/.opatchauto_storage && \
sync

#############################################
Expand Down Expand Up @@ -168,6 +169,7 @@ RUN chmod 755 $INSTALL_SCRIPTS/*.sh && \
$INSTALL_DIR/install/$SETUP_LINUX_FILE && \
$INSTALL_DIR/install/$GRID_SETUP_FILE && \
$INSTALL_DIR/install/$DB_SETUP_FILE && \
rm -rf $DB_HOME/.patch_storage $DB_HOME/.opatchauto_storage $GRID_HOME/.patch_storage $GRID_HOME/.opatchauto_storage && \
sync


Expand All @@ -181,6 +183,11 @@ FROM rac-image-slim-${SLIMMING} AS builder
ARG SLIMMING
# hadolint ignore=DL3006
ARG VERSION
# Linux Env Variable
ENV GRID_BASE=/u01/app/grid \
GRID_HOME=/u01/app/21c/grid \
DB_BASE=/u01/app/oracle \
DB_HOME=/u01/app/oracle/product/21c/dbhome_1
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/
# hadolint ignore=SC2086
RUN chmod 755 $INSTALL_SCRIPTS/*.sh
Expand All @@ -199,6 +206,7 @@ RUN if [ "${SLIMMING}x" != 'truex' ]; then \
$DB_HOME/root.sh && \
su $GRID_USER -c "$INSTALL_SCRIPTS/$GRID_HOME_CLEANUP" && \
su $DB_USER -c "$INSTALL_SCRIPTS/$ORACLE_HOME_CLEANUP" && \
rm -rf $DB_HOME/.patch_storage $DB_HOME/.opatchauto_storage $GRID_HOME/.patch_storage $GRID_HOME/.opatchauto_storage && \
:; \
fi
# hadolint ignore=SC3014
Expand All @@ -208,6 +216,7 @@ RUN if [ "${SLIMMING}x" == 'truex' ]; then \
fi
# hadolint ignore=SC2086
RUN rm -f $INSTALL_DIR/install/* && \
rm -rf $DB_HOME/.patch_storage $DB_HOME/.opatchauto_storage $GRID_HOME/.patch_storage $GRID_HOME/.opatchauto_storage && \
sync

#############################################
Expand All @@ -217,6 +226,11 @@ RUN rm -f $INSTALL_DIR/install/* && \
#############################################
# hadolint ignore=DL3006
FROM rac-image-slim-${SLIMMING} AS final
ENV GRID_BASE=/u01/app/grid \
GRID_HOME=/u01/app/21c/grid \
DB_BASE=/u01/app/oracle \
DB_HOME=/u01/app/oracle/product/21c/dbhome_1
RUN rm -rf $DB_HOME/.patch_storage $DB_HOME/.opatchauto_storage $GRID_HOME/.patch_storage $GRID_HOME/.opatchauto_storage
# hadolint ignore=DL3006
COPY --from=builder /u01 /u01
# hadolint ignore=SC2086
Expand All @@ -242,6 +256,7 @@ RUN if [ "${SLIMMING}x" != 'truex' ]; then \
rm -f /etc/sysctl.d/99-oracle-database-preinstall-21c-sysctl.conf && \
rm -f /etc/sysctl.d/99-sysctl.conf && \
rm -f $INSTALL_DIR/install/* && \
rm -rf $DB_HOME/.patch_storage $DB_HOME/.opatchauto_storage $GRID_HOME/.patch_storage $GRID_HOME/.opatchauto_storage && \
sync

USER ${USER}
Expand All @@ -268,7 +283,8 @@ ARG VERSION
ENV GRID_BASE=/u01/app/grid \
GRID_HOME=/u01/app/21c/grid \
DB_BASE=/u01/app/oracle \
DB_HOME=/u01/app/oracle/product/21c/dbhome_1
DB_HOME=/u01/app/oracle/product/21c/dbhome_1 \
SLIMMING=false
# Use second ENV so that variable get substituted
# hadolint ignore=DL3044
ENV INSTALL_SCRIPTS=$INSTALL_DIR/install \
Expand All @@ -278,4 +294,5 @@ ENV INSTALL_SCRIPTS=$INSTALL_DIR/install \
GRID_PATH=$GRID_HOME/bin:$GRID_HOME/OPatch/:$GRID_HOME/perl/bin:/usr/sbin:/bin:/sbin \
DB_PATH=$DB_HOME/bin:$DB_HOME/OPatch/:$DB_HOME/perl/bin:/usr/sbin:/bin:/sbin \
GRID_LD_LIBRARY_PATH=$GRID_HOME/lib:/usr/lib:/lib \
DB_LD_LIBRARY_PATH=$DB_HOME/lib:/usr/lib:/lib
DB_LD_LIBRARY_PATH=$DB_HOME/lib:/usr/lib:/lib
COPY $VERSION/$ADDNODE_RSP $VERSION/$GRID_INSTALL_RSP $VERSION/$DBCA_RSP $SCRIPT_DIR/