diff --git a/dockerfiles/services/build_apps.sh b/dockerfiles/services/build_apps.sh index 0959e4d..9f0ae2c 100644 --- a/dockerfiles/services/build_apps.sh +++ b/dockerfiles/services/build_apps.sh @@ -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 diff --git a/dockerfiles/services/gitea/Jenkinsfile b/dockerfiles/services/gitea/Jenkinsfile new file mode 100644 index 0000000..fdcfcab --- /dev/null +++ b/dockerfiles/services/gitea/Jenkinsfile @@ -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" + } + } +} diff --git a/dockerfiles/services/gitea/docker-compose.yml b/dockerfiles/services/gitea/docker-compose.yml index 831835b..8658bc8 100644 --- a/dockerfiles/services/gitea/docker-compose.yml +++ b/dockerfiles/services/gitea/docker-compose.yml @@ -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: diff --git a/dockerfiles/services/jenkins/docker-compose.yml b/dockerfiles/services/jenkins/docker-compose.yml index b2f51b9..55782a4 100644 --- a/dockerfiles/services/jenkins/docker-compose.yml +++ b/dockerfiles/services/jenkins/docker-compose.yml @@ -35,6 +35,7 @@ services: driver: fluentd options: fluentd-address: "logs.xai-corp.net:24224" + fluentd-async-connect: 'true' tag: jenkins networks: