Skip to content

Commit 55a9874

Browse files
committed
containerfiel fixes
1 parent 5a5345f commit 55a9874

File tree

2 files changed

+18
-16
lines changed

2 files changed

+18
-16
lines changed

OracleDatabase/RAC/OracleRealApplicationClusters/containerfiles/19.3.0/Containerfile

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ COPY $VERSION/$SETUP_LINUX_FILE $VERSION/$GRID_SETUP_FILE $VERSION/$DB_SETUP_FIL
139139
COPY $VERSION/$RUN_FILE $VERSION/$ADDNODE $VERSION/$ADDNODE_RSP $VERSION/$SETUPSSH $VERSION/$FUNCTIONS $VERSION/$CONFIGGRID $VERSION/$GRID_INSTALL_RSP $VERSION/$DBCA_RSP $VERSION/$PWD_FILE $VERSION/$CHECK_DB_FILE $VERSION/$USER_SCRIPTS_FILE $VERSION/$STOP_FILE $VERSION/$CHECK_DB_FILE $VERSION/$REMOTE_LISTENER_FILE $VERSION/$SETUPGRIDENV $VERSION/$DELNODE $VERSION/$INITSH $VERSION/$RESET_OS_PASSWORD $VERSION/$MULTI_NODE_INSTALL $SCRIPT_DIR/
140140

141141
COPY $RAC_SCRIPTS_DIR $SCRIPT_DIR/scripts
142-
142+
# hadolint ignore=SC2086
143143
RUN chmod 755 $INSTALL_SCRIPTS/*.sh && \
144144
sync && \
145145
$INSTALL_DIR/install/$CHECK_SPACE_FILE && \
@@ -175,7 +175,7 @@ COPY $VERSION/$SETUP_LINUX_FILE $VERSION/$GRID_SETUP_FILE $VERSION/$DB_SETUP_FIL
175175
COPY $VERSION/$RUN_FILE $VERSION/$SETUPSSH $VERSION/$USER_SCRIPTS_FILE $VERSION/$STOP_FILE $VERSION/$CHECK_DB_FILE $VERSION/$REMOTE_LISTENER_FILE $VERSION/$INITSH $VERSION/$RESET_OS_PASSWORD $SCRIPT_DIR/
176176

177177
COPY $RAC_SCRIPTS_DIR $SCRIPT_DIR/scripts
178-
178+
# hadolint ignore=SC2086
179179
RUN chmod 755 $INSTALL_SCRIPTS/*.sh && \
180180
sync && \
181181
$INSTALL_DIR/install/$CHECK_SPACE_FILE && \
@@ -193,11 +193,12 @@ RUN chmod 755 $INSTALL_SCRIPTS/*.sh && \
193193

194194
FROM rac-image-slim-${SLIMMING} AS builder
195195
ARG SLIMMING
196+
# hadolint ignore=DL3006
196197
ARG VERSION
197198
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/
198199

199200
RUN chmod 755 $INSTALL_SCRIPTS/*.sh
200-
201+
# hadolint ignore=SC2086
201202
## Install software if SLIMMING is false
202203
RUN if [ "${SLIMMING}x" != 'truex' ]; then \
203204
sed -e '/hard *memlock/s/^/#/g' -i /etc/security/limits.d/oracle-database-preinstall-19c.conf && \
@@ -213,12 +214,12 @@ RUN if [ "${SLIMMING}x" != 'truex' ]; then \
213214
su $DB_USER -c "$INSTALL_SCRIPTS/$ORACLE_HOME_CLEANUP" && \
214215
:; \
215216
fi
216-
217+
# hadolint ignore=SC3014
217218
RUN if [ "${SLIMMING}x" == 'truex' ]; then \
218219
mkdir /u01 && \
219220
:; \
220221
fi
221-
222+
# hadolint ignore=SC2086
222223
RUN rm -f $INSTALL_DIR/install/* && \
223224
sync
224225

@@ -229,9 +230,9 @@ RUN rm -f $INSTALL_DIR/install/* && \
229230
#############################################
230231

231232
FROM rac-image-slim-${SLIMMING} AS final
232-
233+
# hadolint ignore=DL3006
233234
COPY --from=builder /u01 /u01
234-
235+
# hadolint ignore=SC2086
235236
RUN if [ "${SLIMMING}x" != 'truex' ]; then \
236237
$INVENTORY/orainstRoot.sh && \
237238
$GRID_HOME/root.sh && \
@@ -264,5 +265,5 @@ HEALTHCHECK --interval=2m --start-period=30m \
264265
CMD "$SCRIPT_DIR/scripts/main.py --checkracinst=true" >/dev/null || exit 1
265266

266267
# Define default command to start Oracle Grid and RAC Database setup.
267-
268+
# hadolint ignore=DL3025
268269
ENTRYPOINT /usr/bin/$INITSH

OracleDatabase/RAC/OracleRealApplicationClusters/containerfiles/21.3.0/Containerfile

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ COPY $VERSION/$SETUP_LINUX_FILE $VERSION/$GRID_SETUP_FILE $VERSION/$DB_SETUP_FIL
139139
COPY $VERSION/$RUN_FILE $VERSION/$ADDNODE $VERSION/$ADDNODE_RSP $VERSION/$SETUPSSH $VERSION/$FUNCTIONS $VERSION/$CONFIGGRID $VERSION/$GRID_INSTALL_RSP $VERSION/$DBCA_RSP $VERSION/$PWD_FILE $VERSION/$CHECK_DB_FILE $VERSION/$USER_SCRIPTS_FILE $VERSION/$STOP_FILE $VERSION/$CHECK_DB_FILE $VERSION/$REMOTE_LISTENER_FILE $VERSION/$SETUPGRIDENV $VERSION/$DELNODE $VERSION/$INITSH $VERSION/$RESET_OS_PASSWORD $VERSION/$MULTI_NODE_INSTALL $SCRIPT_DIR/
140140

141141
COPY $RAC_SCRIPTS_DIR $SCRIPT_DIR/scripts
142-
142+
# hadolint ignore=SC2086
143143
RUN chmod 755 $INSTALL_SCRIPTS/*.sh && \
144144
sync && \
145145
$INSTALL_DIR/install/$CHECK_SPACE_FILE && \
@@ -173,7 +173,7 @@ COPY $VERSION/$SETUP_LINUX_FILE $VERSION/$GRID_SETUP_FILE $VERSION/$DB_SETUP_FIL
173173
COPY $VERSION/$RUN_FILE $VERSION/$SETUPSSH $VERSION/$USER_SCRIPTS_FILE $VERSION/$STOP_FILE $VERSION/$CHECK_DB_FILE $VERSION/$REMOTE_LISTENER_FILE $VERSION/$INITSH $VERSION/$RESET_OS_PASSWORD $SCRIPT_DIR/
174174

175175
COPY $RAC_SCRIPTS_DIR $SCRIPT_DIR/scripts
176-
176+
# hadolint ignore=SC2086
177177
RUN chmod 755 $INSTALL_SCRIPTS/*.sh && \
178178
sync && \
179179
$INSTALL_DIR/install/$CHECK_SPACE_FILE && \
@@ -191,11 +191,12 @@ RUN chmod 755 $INSTALL_SCRIPTS/*.sh && \
191191

192192
FROM rac-image-slim-${SLIMMING} AS builder
193193
ARG SLIMMING
194+
# hadolint ignore=DL3006
194195
ARG VERSION
195196
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/
196197

197198
RUN chmod 755 $INSTALL_SCRIPTS/*.sh
198-
199+
# hadolint ignore=SC2086
199200
## Install software if SLIMMING is false
200201
RUN if [ "${SLIMMING}x" != 'truex' ]; then \
201202
sed -e '/hard *memlock/s/^/#/g' -i /etc/security/limits.d/oracle-database-preinstall-21c.conf && \
@@ -211,12 +212,12 @@ RUN if [ "${SLIMMING}x" != 'truex' ]; then \
211212
su $DB_USER -c "$INSTALL_SCRIPTS/$ORACLE_HOME_CLEANUP" && \
212213
:; \
213214
fi
214-
215+
# hadolint ignore=SC3014
215216
RUN if [ "${SLIMMING}x" == 'truex' ]; then \
216217
mkdir /u01 && \
217218
:; \
218219
fi
219-
220+
# hadolint ignore=SC2086
220221
RUN rm -f $INSTALL_DIR/install/* && \
221222
sync
222223

@@ -227,9 +228,9 @@ RUN rm -f $INSTALL_DIR/install/* && \
227228
#############################################
228229

229230
FROM rac-image-slim-${SLIMMING} AS final
230-
231+
# hadolint ignore=DL3006
231232
COPY --from=builder /u01 /u01
232-
233+
# hadolint ignore=SC2086
233234
RUN if [ "${SLIMMING}x" != 'truex' ]; then \
234235
$INVENTORY/orainstRoot.sh && \
235236
$GRID_HOME/root.sh && \
@@ -262,5 +263,5 @@ HEALTHCHECK --interval=2m --start-period=30m \
262263
CMD "$SCRIPT_DIR/scripts/main.py --checkracinst=true" >/dev/null || exit 1
263264

264265
# Define default command to start Oracle Grid and RAC Database setup.
265-
266+
# hadolint ignore=DL3025
266267
ENTRYPOINT /usr/bin/$INITSH

0 commit comments

Comments
 (0)