Skip to content

Commit 34a6aca

Browse files
CLD-910 remove debug output from startup log (#232)
* disable verbose output in curl & keep last reponse * Increment Docker version for release * remove unused variables to resolve linter error * revert the use of -o as it interferes with POST * remove comment
1 parent b02c737 commit 34a6aca

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ pipeline {
305305

306306
parameters {
307307
string(name: 'emailList', defaultValue: emailList, description: 'List of email for build notification', trim: true)
308-
string(name: 'dockerVersion', defaultValue: '1.1.0', description: 'ML Docker version. This version along with ML rpm package version will be the image tag as {ML_Version}_{dockerVersion}', trim: true)
308+
string(name: 'dockerVersion', defaultValue: '1.1.1', description: 'ML Docker version. This version along with ML rpm package version will be the image tag as {ML_Version}_{dockerVersion}', trim: true)
309309
string(name: 'platformString', defaultValue: 'centos', description: 'Platform string for Docker image version. Will be made part of the docker image tag', trim: true)
310310
choice(name: 'ML_SERVER_BRANCH', choices: 'develop-11.1\ndevelop\ndevelop-10.0\ndevelop-9.0', description: 'MarkLogic Server Branch. used to pick appropriate rpm')
311311
string(name: 'ML_RPM', defaultValue: '', description: 'RPM to be used for Image creation. \n If left blank nightly ML rpm will be used.\n Please provide Jenkins accessible path e.g. /project/engineering or /project/qa', trim: true)

dockerFiles/marklogic-server-centos:base

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ ARG BUILD_BRANCH=local
6868

6969
LABEL "com.marklogic.maintainer"="[email protected]"
7070
LABEL "com.marklogic.name"="MarkLogic Server ${ML_VERSION}"
71-
LABEL "com.marklogic.version"="1.1.0"
71+
LABEL "com.marklogic.version"="1.1.1"
7272
LABEL "com.marklogic"="MarkLogic"
7373
LABEL "com.marklogic.release-type"="production"
7474
LABEL "com.marklogic.release-version"="${ML_VERSION}"

src/centos/scripts/start-marklogic.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ function curl_retry_validate {
223223

224224
for ((retry_count = 0; retry_count < N_RETRY; retry_count = retry_count + 1)); do
225225

226-
response=$(curl -m 30 -v -w '%{http_code}' "${curl_options[@]}" "$endpoint")
226+
response=$(curl -s -m 30 -w '%{http_code}' "${curl_options[@]}" "$endpoint")
227227
response_code=$(tail -n1 <<< "$response")
228228
response_content=$(sed '$ d' <<< "$response")
229229

test/structure-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ metadataTest:
3838
- key: "com.marklogic.name"
3939
value: "MarkLogic Server VERSION_PLACEHOLDER"
4040
- key: "com.marklogic.version"
41-
value: "1.1.0"
41+
value: "1.1.1"
4242
- key: "com.marklogic.release-version"
4343
value: "VERSION_PLACEHOLDER"
4444
- key: "com.marklogic.build-branch"

0 commit comments

Comments
 (0)