File tree Expand file tree Collapse file tree 3 files changed +14
-9
lines changed Expand file tree Collapse file tree 3 files changed +14
-9
lines changed Original file line number Diff line number Diff line change @@ -126,7 +126,8 @@ ENV MARKLOGIC_INSTALL_DIR=/opt/MarkLogic \
126
126
# Set Timezone
127
127
################################################################
128
128
129
- RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
129
+ RUN RUN microdnf reinstall -y tzdata \
130
+ && ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
130
131
131
132
################################################################
132
133
# Set appropriate authorisation to MARKLOGIC_DATA_DIR
Original file line number Diff line number Diff line change @@ -169,10 +169,12 @@ function validate_tls_parameters {
169
169
# ###############################################################
170
170
function validate_cert {
171
171
local cacertfile=$1
172
- local response
173
- curl -s -S -L --cacert " ${cacertfile} " --ssl " ${ML_BOOTSTRAP_PROTOCOL} " ://" ${MARKLOGIC_BOOTSTRAP_HOST} " :8001 --anyauth --user " ${ML_ADMIN_USERNAME} " :" ${ML_ADMIN_PASSWORD} "
174
- response=$?
175
- if [ $response -ne 0 ]; then
172
+ local return_code
173
+ local curl_output
174
+ curl_output=$( curl -s -S -L --cacert " ${cacertfile} " --ssl " ${ML_BOOTSTRAP_PROTOCOL} " ://" ${MARKLOGIC_BOOTSTRAP_HOST} " :8001 --anyauth --user " ${ML_ADMIN_USERNAME} " :" ${ML_ADMIN_PASSWORD} " )
175
+ return_code=$?
176
+ if [ $return_code -ne 0 ]; then
177
+ info " $curl_output "
176
178
error " MARKLOGIC_JOIN_CACERT_FILE is not valid, please check above error for details. Node shutting down." exit
177
179
fi
178
180
}
Original file line number Diff line number Diff line change @@ -193,10 +193,12 @@ function validate_tls_parameters {
193
193
# ###############################################################
194
194
function validate_cert {
195
195
local cacertfile=$1
196
- local response
197
- curl -s -S -L --cacert " ${cacertfile} " --ssl " ${ML_BOOTSTRAP_PROTOCOL} " ://" ${MARKLOGIC_BOOTSTRAP_HOST} " :8001 --anyauth --user " ${ML_ADMIN_USERNAME} " :" ${ML_ADMIN_PASSWORD} "
198
- response=$?
199
- if [ $response -ne 0 ]; then
196
+ local return_code
197
+ local curl_output
198
+ curl_output=$( curl -s -S -L --cacert " ${cacertfile} " --ssl " ${ML_BOOTSTRAP_PROTOCOL} " ://" ${MARKLOGIC_BOOTSTRAP_HOST} " :8001 --anyauth --user " ${ML_ADMIN_USERNAME} " :" ${ML_ADMIN_PASSWORD} " )
199
+ return_code=$?
200
+ if [ $return_code -ne 0 ]; then
201
+ info " $curl_output "
200
202
error " MARKLOGIC_JOIN_CACERT_FILE is not valid, please check above error for details. Node shutting down." exit
201
203
fi
202
204
}
You can’t perform that action at this time.
0 commit comments