- add gitea healthcheck and Jenkinsfile

- make jenkins logging connect to fluentd asynchronously
This commit is contained in:
2018-10-26 22:46:12 -04:00
parent 1828e180c7
commit 3a70a80ea9
4 changed files with 28 additions and 1 deletions

View File

@@ -8,7 +8,6 @@ docker login -u richard -p $DKREGISTRY_PASS $DKREGISTRY
(cd prometheus && docker-compose -f docker-compose.yml build)
docker push dkregistry.xai-corp.net:5000/xaicorp/nextcloud:latest
#docker push dkregistry.xai-corp.net:5000/xaicorp/nextcloud-web:latest
docker push dkregistry.xai-corp.net:5000/sslproxy:2.1
docker push dkregistry.xai-corp.net:5000/letsencrypt:latest
docker push dkregistry.xai-corp.net:5000/xaicorp/prometheus:latest

20
dockerfiles/services/gitea/Jenkinsfile vendored Normal file
View File

@@ -0,0 +1,20 @@
node('docker') {
def workdir = 'dockerfiles/services/gitea'
stage('prepare') {
git credentialsId: 'f1f58215-c789-44a2-9b72-50e4425cb061', url: 'ssh://git@git.xai-corp.net:10022/xai-corp.net/provisioning.git'
sh 'ls'
}
stage('build') {
dir(workdir) {
//nothing to do
}
}
stage('deploy') {
dir(workdir) {
sh "DOCKER_HOST=dkhost:2376 docker stack deploy -c docker-compose.yml gitea"
}
}
}

View File

@@ -31,6 +31,13 @@ services:
cpus: '0.5'
memory: 96M
healthcheck:
test: ["CMD", "curl", "-If", "http://localhost:3000"]
interval: 1m30s
timeout: 10s
retries: 3
start_period: 20s
logging:
driver: fluentd
options:

View File

@@ -35,6 +35,7 @@ services:
driver: fluentd
options:
fluentd-address: "logs.xai-corp.net:24224"
fluentd-async-connect: 'true'
tag: jenkins
networks: