Skip to content

Commit 0f2c845

Browse files
committed
fix TZ and add fix for HTTPS logs
1 parent f0b1d1c commit 0f2c845

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

dockerFiles/marklogic-server-ubi-rootless:base

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@ ENV MARKLOGIC_INSTALL_DIR=/opt/MarkLogic \
126126
# Set Timezone
127127
################################################################
128128

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
130131

131132
################################################################
132133
# Set appropriate authorisation to MARKLOGIC_DATA_DIR

src/scripts/start-marklogic-rootless.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,12 @@ function validate_tls_parameters {
169169
################################################################
170170
function validate_cert {
171171
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"
176178
error "MARKLOGIC_JOIN_CACERT_FILE is not valid, please check above error for details. Node shutting down." exit
177179
fi
178180
}

src/scripts/start-marklogic.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,12 @@ function validate_tls_parameters {
193193
################################################################
194194
function validate_cert {
195195
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"
200202
error "MARKLOGIC_JOIN_CACERT_FILE is not valid, please check above error for details. Node shutting down." exit
201203
fi
202204
}

0 commit comments

Comments
 (0)