Module: check_mk
Branch: master
Commit: ae85585f4b775a38317ae09e51a8f8ff1b5d829a
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ae85585f4b775a…
Author: Alex Zurhake <az(a)mathias-kettner.de>
Date: Thu Mar 28 14:26:27 2019 +0100
CMK-1909 set hostname for docker
Change-Id: I693979aa291e3e2069b8f6a75445dbcb56da6eb0
---
buildscripts/scripts/integration-daily-master.jenkins | 2 +-
buildscripts/scripts/nightly-build.jenkins | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/buildscripts/scripts/integration-daily-master.jenkins
b/buildscripts/scripts/integration-daily-master.jenkins
index 5c8eacd..3b0eca0 100644
--- a/buildscripts/scripts/integration-daily-master.jenkins
+++ b/buildscripts/scripts/integration-daily-master.jenkins
@@ -51,7 +51,7 @@ try {
node {
docker.withRegistry(DOCKER_REGISTRY, 'nexus') {
docker.image(DISTRO + '-os-image').pull()
- docker.image(DISTRO + '-os-image').inside("-u 0:0 -v
/bauwelt/download/$CMK_VERSION:/bauwelt/download/$CMK_VERSION:ro -v $TEST_DATA:$TEST_DATA
--init --privileged --network ci_local-infra") {
+ docker.image(DISTRO + '-os-image').inside("-u 0:0 -v
/bauwelt/download/$CMK_VERSION:/bauwelt/download/$CMK_VERSION:ro -v $TEST_DATA:$TEST_DATA
--init --privileged --network ci_local-infra --hostname ${DISTRO}") {
stage('install ' + DISTRO + ' omd') {
DISTRO_CODE = sh ( script: """
case $DISTRO in
diff --git a/buildscripts/scripts/nightly-build.jenkins
b/buildscripts/scripts/nightly-build.jenkins
index 3e43969..de282b6 100644
--- a/buildscripts/scripts/nightly-build.jenkins
+++ b/buildscripts/scripts/nightly-build.jenkins
@@ -171,7 +171,7 @@ DISTRO_LIST.each { DISTRO ->
node {
docker.withRegistry(DOCKER_REGISTRY, 'nexus') {
docker.image(DISTRO).pull()
- docker.image(DISTRO).inside("-u 0:0 -v ${DAILY_DATA}:${DAILY_DATA}
--privileged --network ci_local-infra") {
+ docker.image(DISTRO).inside("-u 0:0 -v ${DAILY_DATA}:${DAILY_DATA}
--privileged --network ci_local-infra --hostname ${DISTRO}") {
stage('build' + DISTRO + ' package') {
sh 'rm -rf *'
sh 'mkdir work dest'