diff --git a/dockerfiles/services/jenkins/docker-compose.yml b/dockerfiles/services/jenkins/docker-compose.yml index 8224294..9909566 100644 --- a/dockerfiles/services/jenkins/docker-compose.yml +++ b/dockerfiles/services/jenkins/docker-compose.yml @@ -36,19 +36,19 @@ services: cpus: '2' memory: 1536M - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080/metrics/ejkxeVI-iKLy968ji9AnfYmOHGIh1kYd3gA500JqrRxzTeenT06ynR5Dqo0CQplO/ping"] - interval: 1m30s - timeout: 10s - retries: 3 - start_period: 3m +# healthcheck: +# test: ["CMD", "curl", "-f", "http://localhost:8080/metrics/ejkxeVI-iKLy968ji9AnfYmOHGIh1kYd3gA500JqrRxzTeenT06ynR5Dqo0CQplO/ping"] +# interval: 1m30s +# timeout: 10s +# retries: 3 +# start_period: 3m - logging: - driver: fluentd - options: - fluentd-address: "logs.xai-corp.net:24224" - fluentd-async-connect: 'true' - tag: jenkins +# logging: +# driver: fluentd +# options: +# fluentd-address: "logs.xai-corp.net:24224" +# fluentd-async-connect: 'true' +# tag: jenkins networks: - prod_ui diff --git a/dockerfiles/tasks/JenkinsAgents/build.sh b/dockerfiles/tasks/JenkinsAgents/build.sh new file mode 100755 index 0000000..6925af0 --- /dev/null +++ b/dockerfiles/tasks/JenkinsAgents/build.sh @@ -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 + diff --git a/dockerfiles/tasks/JenkinsAgents/docker-compose/Dockerfile b/dockerfiles/tasks/JenkinsAgents/docker-compose/Dockerfile new file mode 100644 index 0000000..542b03e --- /dev/null +++ b/dockerfiles/tasks/JenkinsAgents/docker-compose/Dockerfile @@ -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