disable broken jenkins healthcheck

This commit is contained in:
2020-04-02 19:13:37 -04:00
parent 4f5e23817b
commit 24dd9707f9
3 changed files with 47 additions and 12 deletions

View File

@@ -36,19 +36,19 @@ services:
cpus: '2' cpus: '2'
memory: 1536M memory: 1536M
healthcheck: # healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:8080/metrics/ejkxeVI-iKLy968ji9AnfYmOHGIh1kYd3gA500JqrRxzTeenT06ynR5Dqo0CQplO/ping"] # test: ["CMD", "curl", "-f", "http://localhost:8080/metrics/ejkxeVI-iKLy968ji9AnfYmOHGIh1kYd3gA500JqrRxzTeenT06ynR5Dqo0CQplO/ping"]
interval: 1m30s # interval: 1m30s
timeout: 10s # timeout: 10s
retries: 3 # retries: 3
start_period: 3m # start_period: 3m
logging: # logging:
driver: fluentd # driver: fluentd
options: # options:
fluentd-address: "logs.xai-corp.net:24224" # fluentd-address: "logs.xai-corp.net:24224"
fluentd-async-connect: 'true' # fluentd-async-connect: 'true'
tag: jenkins # tag: jenkins
networks: networks:
- prod_ui - prod_ui

View File

@@ -0,0 +1,10 @@
#!/usr/bin/env bash
set -e
# agent with docker-compose
docker build --rm -f docker-compose/Dockerfile -t xaicorp/jenkins-agent-docker-compose:latest .
docker run --rm --entrypoint docker xaicorp/jenkins-agent-docker-compose:latest version | grep 'Version:'
docker run --rm --entrypoint docker-compose xaicorp/jenkins-agent-docker-compose:latest --version | grep 'docker-compose version 1.23'
docker tag xaicorp/jenkins-agent-docker-compose:latest dkregistry.xai-corp.net:5000/xaicorp/jenkins-agent-docker-compose:latest
docker push dkregistry.xai-corp.net:5000/xaicorp/jenkins-agent-docker-compose:latest

View File

@@ -0,0 +1,25 @@
FROM jenkins/jnlp-agent-docker
MAINTAINER Richard Morgan
ENV BUILD_PACKAGES \
py-pip \
python-dev \
libffi-dev \
openssl-dev \
gcc \
libc-dev \
make
user root
RUN apk update && apk upgrade \
&& apk add --no-cache ${BUILD_PACKAGES};
#RUN curl -L "https://github.com/docker/compose/releases/download/1.25.4/docker-compose-c-$(uname -m)"\
# -o /usr/local/bin/docker-compose \
# && chmod +x /usr/local/bin/docker-compose
RUN curl -L --fail https://github.com/docker/compose/releases/download/1.25.4/run.sh -o /usr/local/bin/docker-compose \
&& chmod +x /usr/local/bin/docker-compose
user jenkins