Skip to content
This repository was archived by the owner on Jan 6, 2021. It is now read-only.

Commit 65d707c

Browse files
committed
need to have a service startup message in the logs for the ci process running the container
1 parent c4f09d0 commit 65d707c

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

Diff for: Jenkinsfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pipeline {
2424
CI_PORT='80'
2525
CI_SSL='false'
2626
CI_DELAY='30'
27-
CI_DOCKERENV='TZ=US/Pacific'
27+
CI_DOCKERENV='TEST_RUN=1'
2828
CI_AUTH=''
2929
CI_WEBPATH=''
3030
}

Diff for: jenkins-vars.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ repo_vars:
2121
- CI_PORT='80'
2222
- CI_SSL='false'
2323
- CI_DELAY='30'
24-
- CI_DOCKERENV='TZ=US/Pacific'
24+
- CI_DOCKERENV='TEST_RUN=1'
2525
- CI_AUTH=''
2626
- CI_WEBPATH=''

Diff for: root/etc/cont-init.d/50-config

+5
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@ DNSPLUGIN=${DNSPLUGIN}\\n\
1515
EMAIL=${EMAIL}\\n\
1616
STAGING=${STAGING}\\n"
1717

18+
# Echo init finish for test runs
19+
if [ -n "${TEST_RUN}" ]; then
20+
echo '[services.d] done.'
21+
fi
22+
1823
# Sanitize variables
1924
SANED_VARS=( DHLEVEL DNSPLUGIN EMAIL EXTRA_DOMAINS ONLY_SUBDOMAINS STAGING SUBDOMAINS URL VALIDATION )
2025
for i in "${SANED_VARS[@]}"

0 commit comments

Comments
 (0)