From 8cf812b97f6f5d6212ac2c06eeb371abfa2eeb66 Mon Sep 17 00:00:00 2001 From: Bastian Klein Date: Tue, 30 Jan 2018 11:00:09 +0100 Subject: [PATCH] Using newest Docker and docker-compose version --- .travis.yml | 12 +- cmd/compose | 40 +- compose/elk.yml | 71 ++-- docker-compose.yml | 660 ++++++++++++++++----------------- etc/aws/default.yml | 16 +- etc/logging/syslog/default.yml | 249 +++++++------ etc/volumes/local/default.yml | 114 +++--- etc/volumes/nfs/default.yml | 214 ++++++----- 8 files changed, 705 insertions(+), 671 deletions(-) diff --git a/.travis.yml b/.travis.yml index 11f1b289c..380020bab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,20 +6,20 @@ services: env: global: - - DOCKER_ENGINE_VERSION=1.10.3 - - DOCKER_COMPOSE_VERSION=1.9.0 + - DOCKER_VERSION=17.12.0-ce + - DOCKER_COMPOSE_VERSION=1.18.0 - INITIAL_ADMIN_USER=admin.user - INITIAL_ADMIN_PASSWORD_PLAIN=admin123 - COMPOSE_FILES="-f site/docker-compose.yml" - JEKYLL_SOURCE="/site" before_install: - - sudo sh -c 'echo "deb https://apt.dockerproject.org/repo ubuntu-trusty main" > /etc/apt/sources.list.d/docker.list' - - sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D + - sudo apt-get install apt-transport-https ca-certificates curl software-properties-common + - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - + - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" - sudo apt-get update - sudo apt-key update - - sudo apt-get install -qqy --force-yes linux-image-extra-$(uname -r) apparmor - - sudo apt-get install -qqy --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" docker-engine=${DOCKER_ENGINE_VERSION}\* + - sudo apt-get install docker-ce - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose - chmod +x docker-compose - sudo mv docker-compose /usr/local/bin diff --git a/cmd/compose b/cmd/compose index 15e0c58b2..7626fec9e 100755 --- a/cmd/compose +++ b/cmd/compose @@ -108,14 +108,14 @@ while [[ $1 ]]; do esac done - echo ' - ### ######## ####### ######## - ## ## ## ## ## ## ## ## - ## ## ## ## ## ## ## ## - ## ## ## ## ## ## ######## - ######### ## ## ## ## ## - ## ## ## ## ## ## ## - ## ## ######## ####### ## + echo ' + ### ######## ####### ######## + ## ## ## ## ## ## ## ## + ## ## ## ## ## ## ## ## + ## ## ## ## ## ## ######## + ######### ## ## ## ## ## + ## ## ## ## ## ## ## + ## ## ######## ####### ## ' echo "* Initialising ADOP" @@ -143,7 +143,7 @@ done TOOL_SLEEP_TIME=30 until [[ $(docker exec jenkins curl -I -s -u "${JENKINS_PLATFORM_USERNAME}":"${PASSWORD_JENKINS}" localhost:8080/jenkins/|head -n 1|cut -d$' ' -f2) == 200 ]]; do pretty_sleep ${TOOL_SLEEP_TIME} Jenkins; done until [[ $(docker exec gerrit curl -I -s -u "${GERRIT_PLATFORM_USERNAME}":"${PASSWORD_GERRIT}" localhost:8080/gerrit/|head -n 1|cut -d$' ' -f2) == 200 ]]; do pretty_sleep ${TOOL_SLEEP_TIME} Gerrit; done - + # Trigger Load_Platform in Jenkins if [ "${LOAD}" = "NO" ]; then echo "* Skipping Loading the Platform" @@ -158,11 +158,11 @@ done else echo "DOCKER_TLS_VERIFY not set to 1, skipping certificate generation" fi - + # Wait for Nginx to come up before proceeding echo "* Waiting for Nginx to become available" until [[ $(curl -k -I -s -u ${INITIAL_ADMIN_USER}:${INITIAL_ADMIN_PASSWORD_PLAIN} ${PROTO}://${TARGET_HOST}/|head -n 1|cut -d$' ' -f2) == 200 ]]; do pretty_sleep 5 Nginx; done - + # Tell the user something useful echo echo '##########################################################' @@ -195,23 +195,23 @@ gen_certs() { CERT_PATH=$1 if [ -z ${CERT_PATH} ]; then echo " - Usage : + Usage : gen-certs - - : + + : This is the path of the certificate on jenkins slave container to be able to run docker commands against docker swarm. Note - absolute path is required. - - Example: + + Example: gen-certs /root/.docker " exit 1 fi #### - # Windows Git bash terminal identifies - # /CN=client as a path and appends the absolute path + # Windows Git bash terminal identifies + # /CN=client as a path and appends the absolute path # of parent directory to it #### HOST_OS=$(uname) @@ -223,7 +223,7 @@ gen_certs() { #### # Fresh start - #### + #### TEMP_CERT_PATH="${HOME}/docker_certs" rm -rf ${TEMP_CERT_PATH} mkdir -p ${TEMP_CERT_PATH} @@ -262,7 +262,7 @@ gen_certs() { #### # * Remove unnecessary files - # * Copy the certificates to slave + # * Copy the certificates to slave #### echo "Uploading certificates to Jenkins Slave at: ${CERT_PATH}" rm -f ${TEMP_CERT_PATH}/extfile.cnf ${TEMP_CERT_PATH}/client.csr diff --git a/compose/elk.yml b/compose/elk.yml index 4bb7105f8..d318e69d3 100644 --- a/compose/elk.yml +++ b/compose/elk.yml @@ -1,36 +1,43 @@ # set CUSTOM_NETWORK_NAME to the name of the custom Docker network +version: "3" -elasticsearch: - container_name: elasticsearch - restart: always - image: elasticsearch:2.1.1 - net: ${CUSTOM_NETWORK_NAME} - command: elasticsearch -Des.network.host=0.0.0.0 - ports: - - "9200:9200" - volumes: - - elasticsearch_data:/usr/share/elasticsearch/data +services: + elasticsearch: + container_name: elasticsearch + restart: always + image: elasticsearch:2.1.1 + command: elasticsearch -Des.network.host=0.0.0.0 + ports: + - "9200:9200" + volumes: + - elasticsearch_data:/usr/share/elasticsearch/data -logstash: - container_name: logstash - restart: always - image: accenture/adop-logstash:0.1.0 - net: ${CUSTOM_NETWORK_NAME} - environment: - - "constraint:tier==public" - - LS_HEAP_SIZE=1024m - ports: - - "12201:12201/udp" - - "25826:25826/udp" - - "5000:5000/tcp" + logstash: + container_name: logstash + restart: always + image: accenture/adop-logstash:0.1.0 + environment: + - "constraint:tier==public" + - LS_HEAP_SIZE=1024m + ports: + - "12201:12201/udp" + - "25826:25826/udp" + - "5000:5000/tcp" -kibana: - container_name: kibana - restart: always - image: kibana:4.3.1 - net: ${CUSTOM_NETWORK_NAME} - command: kibana - environment: - - ELASTICSEARCH_URL=http://elasticsearch:9200 - ports: - - "5601:5601" + kibana: + container_name: kibana + restart: always + image: kibana:4.3.1 + command: kibana + environment: + - ELASTICSEARCH_URL=http://elasticsearch:9200 + ports: + - "5601:5601" + +volumes: + elasticsearch_data: + +networks: + default: + external: + name: ${CUSTOM_NETWORK_NAME} diff --git a/docker-compose.yml b/docker-compose.yml index 5741619f0..e31844478 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,360 +1,346 @@ # set TARGET_HOST to dns/ip of proxy # set LOGSTASH_HOST to dns/ip of logstash host +version: '3' -proxy: - container_name: proxy - restart: always - image: accenture/adop-nginx:0.3.2 - #build: ../images/docker-nginx/ - net: ${CUSTOM_NETWORK_NAME} - ports: - - "80:80" - - "443:443" - environment: - - "constraint:tier==public" - - "LDAP_SERVER=${LDAP_SERVER}" - - "LDAP_USERNAME=${LDAP_ADMIN},${LDAP_FULL_DOMAIN}" - - "LDAP_PASSWORD=${LDAP_PWD}" - - "LDAP_USER_BASE_DN=${LDAP_USER_BASE_DN},${LDAP_FULL_DOMAIN}" - - "LDAP_GROUP_ATTRIBUTE=member" - - "LDAP_USER_ID_ATTRIBUTE=cn" - - "LDAP_USER_OBJECT_CLASS=inetOrgPerson" +services: + proxy: + container_name: proxy + restart: always + image: accenture/adop-nginx:0.3.2 + #build: ../images/docker-nginx/ + ports: + - "80:80" + - "443:443" + environment: + - "constraint:tier==public" + - "LDAP_SERVER=${LDAP_SERVER}" + - "LDAP_USERNAME=${LDAP_ADMIN},${LDAP_FULL_DOMAIN}" + - "LDAP_PASSWORD=${LDAP_PWD}" + - "LDAP_USER_BASE_DN=${LDAP_USER_BASE_DN},${LDAP_FULL_DOMAIN}" + - "LDAP_GROUP_ATTRIBUTE=member" + - "LDAP_USER_ID_ATTRIBUTE=cn" + - "LDAP_USER_OBJECT_CLASS=inetOrgPerson" -ldap: - container_name: ldap - restart: always - #build: ../images/docker-ldap/ - image: accenture/adop-ldap:0.1.3 - net: ${CUSTOM_NETWORK_NAME} - expose: - - "389" - ports: - - "389:389/tcp" - environment: - INITIAL_ADMIN_USER: ${INITIAL_ADMIN_USER} - INITIAL_ADMIN_PASSWORD: ${INITIAL_ADMIN_PASSWORD} - JENKINS_PLATFORM_USERNAME: ${JENKINS_PLATFORM_USERNAME} - JENKINS_PASSWORD: ${JENKINS_PWD} - GERRIT_PLATFORM_USERNAME: ${GERRIT_PLATFORM_USERNAME} - GERRIT_PASSWORD: ${GERRIT_PWD} - SLAPD_PASSWORD: ${LDAP_PWD} - SLAPD_DOMAIN: ${LDAP_DOMAIN} - SLAPD_FULL_DOMAIN: ${LDAP_FULL_DOMAIN} + ldap: + container_name: ldap + restart: always + #build: ../images/docker-ldap/ + image: accenture/adop-ldap:0.1.3 + expose: + - "389" + ports: + - "389:389/tcp" + environment: + INITIAL_ADMIN_USER: ${INITIAL_ADMIN_USER} + INITIAL_ADMIN_PASSWORD: ${INITIAL_ADMIN_PASSWORD} + JENKINS_PLATFORM_USERNAME: ${JENKINS_PLATFORM_USERNAME} + JENKINS_PASSWORD: ${JENKINS_PWD} + GERRIT_PLATFORM_USERNAME: ${GERRIT_PLATFORM_USERNAME} + GERRIT_PASSWORD: ${GERRIT_PWD} + SLAPD_PASSWORD: ${LDAP_PWD} + SLAPD_DOMAIN: ${LDAP_DOMAIN} + SLAPD_FULL_DOMAIN: ${LDAP_FULL_DOMAIN} -gerrit-mysql: - container_name: gerrit-mysql - restart: always - image: mysql:5.6.25 - net: ${CUSTOM_NETWORK_NAME} - expose: - - "3306" - environment: - MYSQL_ROOT_PASSWORD: ${PASSWORD_SQL} - MYSQL_USER: ${GERRIT_MYSQL_USER} - MYSQL_PASSWORD: ${GERRIT_MYSQL_PASSWORD} - MYSQL_DATABASE: ${GERRIT_MYSQL_DATABASE} + gerrit-mysql: + container_name: gerrit-mysql + restart: always + image: mysql:5.6.25 + expose: + - "3306" + environment: + MYSQL_ROOT_PASSWORD: ${PASSWORD_SQL} + MYSQL_USER: ${GERRIT_MYSQL_USER} + MYSQL_PASSWORD: ${GERRIT_MYSQL_PASSWORD} + MYSQL_DATABASE: ${GERRIT_MYSQL_DATABASE} -gerrit: - container_name: gerrit - restart: always - #build: ../images/docker-gerrit/ - image: accenture/adop-gerrit:0.1.3 - privileged: true - net: ${CUSTOM_NETWORK_NAME} - expose: - - "8080" - - "29418" - environment: - - "dependency:container==gerrit-mysql" - - "REPO_PATH=/var/git/repos" - - "WEBURL=${PROTO}://${TARGET_HOST}/gerrit/" - - "DATABASE_TYPE=mysql" - - "DB_HOSTNAME=gerrit-mysql" - - "DB_PORT=3306" - - "DB_NAME=${GERRIT_MYSQL_DATABASE}" - - "DB_USER=${GERRIT_MYSQL_USER}" - - "DB_PASSWORD=${GERRIT_MYSQL_PASSWORD}" - - "AUTH_LOGOUTURL=${PROTO}://${TARGET_HOST}/gerrit/" - - "AUTH_TYPE=LDAP" - - "GERRIT_PASSWORD=${PASSWORD_GERRIT}" - - "JENKINS_PASSWORD=${PASSWORD_JENKINS}" - - "INITIAL_ADMIN_USER=${INITIAL_ADMIN_USER}" - - "INITIAL_ADMIN_PASSWORD=${INITIAL_ADMIN_PASSWORD_PLAIN}" - - "LDAP_SERVER=${LDAP_SERVER}" - - "LDAP_ACCOUNTBASE=${LDAP_FULL_DOMAIN}" - - "LDAP_ACCOUNTPATTERN=${LDAP_ACCOUNTPATTERN}" - - "LDAP_ACCOUNTFULLNAME=${LDAP_ACCOUNTFULLNAME}" - - "LDAP_ACCOUNTEMAILADDRESS=mail" - - "LDAP_USERNAME=${LDAP_ADMIN},${LDAP_FULL_DOMAIN}" - - "LDAP_PASSWORD=${LDAP_PWD}" - - "LDAP_GROUPBASE=${LDAP_GROUP_BASE_DN},${LDAP_FULL_DOMAIN}" - - "LDAP_GROUPPATTERN=${LDAP_GROUPPATTERN}" - - "LDAP_GROUPMEMBERPATTERN=${LDAP_GROUPMEMBERPATTERN}" - - "HTTPD_LISTENURL=proxy-${PROTO}://0.0.0.0:8080/gerrit" - - "USER_NAME=${GERRIT_USER_NAME}" - - "USER_EMAIL=${GERRIT_USER_EMAIL}" - - "DOWNLOAD_SCHEME=http" + gerrit: + container_name: gerrit + restart: always + #build: ../images/docker-gerrit/ + image: accenture/adop-gerrit:0.1.3 + privileged: true + expose: + - "8080" + - "29418" + environment: + - "dependency:container==gerrit-mysql" + - "REPO_PATH=/var/git/repos" + - "WEBURL=${PROTO}://${TARGET_HOST}/gerrit/" + - "DATABASE_TYPE=mysql" + - "DB_HOSTNAME=gerrit-mysql" + - "DB_PORT=3306" + - "DB_NAME=${GERRIT_MYSQL_DATABASE}" + - "DB_USER=${GERRIT_MYSQL_USER}" + - "DB_PASSWORD=${GERRIT_MYSQL_PASSWORD}" + - "AUTH_LOGOUTURL=${PROTO}://${TARGET_HOST}/gerrit/" + - "AUTH_TYPE=LDAP" + - "GERRIT_PASSWORD=${PASSWORD_GERRIT}" + - "JENKINS_PASSWORD=${PASSWORD_JENKINS}" + - "INITIAL_ADMIN_USER=${INITIAL_ADMIN_USER}" + - "INITIAL_ADMIN_PASSWORD=${INITIAL_ADMIN_PASSWORD_PLAIN}" + - "LDAP_SERVER=${LDAP_SERVER}" + - "LDAP_ACCOUNTBASE=${LDAP_FULL_DOMAIN}" + - "LDAP_ACCOUNTPATTERN=${LDAP_ACCOUNTPATTERN}" + - "LDAP_ACCOUNTFULLNAME=${LDAP_ACCOUNTFULLNAME}" + - "LDAP_ACCOUNTEMAILADDRESS=mail" + - "LDAP_USERNAME=${LDAP_ADMIN},${LDAP_FULL_DOMAIN}" + - "LDAP_PASSWORD=${LDAP_PWD}" + - "LDAP_GROUPBASE=${LDAP_GROUP_BASE_DN},${LDAP_FULL_DOMAIN}" + - "LDAP_GROUPPATTERN=${LDAP_GROUPPATTERN}" + - "LDAP_GROUPMEMBERPATTERN=${LDAP_GROUPMEMBERPATTERN}" + - "HTTPD_LISTENURL=proxy-${PROTO}://0.0.0.0:8080/gerrit" + - "USER_NAME=${GERRIT_USER_NAME}" + - "USER_EMAIL=${GERRIT_USER_EMAIL}" + - "DOWNLOAD_SCHEME=http" -sensu-uchiwa: - container_name: sensu-uchiwa - restart: always - image: sstarcher/uchiwa:0.15.0 - net: ${CUSTOM_NETWORK_NAME} - environment: - SENSU_HOSTNAME: sensu-api - SENSU_DC_NAME: Sensu - expose: - - "3000" + sensu-uchiwa: + container_name: sensu-uchiwa + restart: always + image: sstarcher/uchiwa:0.15.0 + environment: + SENSU_HOSTNAME: sensu-api + SENSU_DC_NAME: Sensu + expose: + - "3000" -sensu-api: - container_name: sensu-api - restart: always - image: accenture/adop-sensu:0.2.0 - net: ${CUSTOM_NETWORK_NAME} - command: api - expose: - - "4567" - environment: - TRANSPORT_NAME: rabbitmq - RABBITMQ_HOST: sensu-rabbitmq - REDIS_HOST: sensu-redis + sensu-api: + container_name: sensu-api + restart: always + image: accenture/adop-sensu:0.2.0 + command: api + expose: + - "4567" + environment: + TRANSPORT_NAME: rabbitmq + RABBITMQ_HOST: sensu-rabbitmq + REDIS_HOST: sensu-redis -sensu-server: - container_name: sensu-server - restart: always - image: accenture/adop-sensu:0.2.0 - net: ${CUSTOM_NETWORK_NAME} - command: server - environment: - API_HOST: sensu-api - RABBITMQ_HOST: sensu-rabbitmq - REDIS_HOST: sensu-redis - TRANSPORT_NAME: rabbitmq + sensu-server: + container_name: sensu-server + restart: always + image: accenture/adop-sensu:0.2.0 + command: server + environment: + API_HOST: sensu-api + RABBITMQ_HOST: sensu-rabbitmq + REDIS_HOST: sensu-redis + TRANSPORT_NAME: rabbitmq -sensu-client: - container_name: sensu-client - restart: always - image: accenture/adop-sensu:0.2.0 - net: ${CUSTOM_NETWORK_NAME} - command: client - environment: - TRANSPORT_NAME: rabbitmq - CLIENT_NAME: core - CLIENT_ADDRESS: 127.0.0.1 - RABBITMQ_HOST: sensu-rabbitmq - JENKINS_PREFIX: jenkins - CLIENT_SUBSCRIPTIONS: "proxy,gerrit,jenkins,nexus,sonarqube,sensu,kibana" + sensu-client: + container_name: sensu-client + restart: always + image: accenture/adop-sensu:0.2.0 + command: client + environment: + TRANSPORT_NAME: rabbitmq + CLIENT_NAME: core + CLIENT_ADDRESS: 127.0.0.1 + RABBITMQ_HOST: sensu-rabbitmq + JENKINS_PREFIX: jenkins + CLIENT_SUBSCRIPTIONS: "proxy,gerrit,jenkins,nexus,sonarqube,sensu,kibana" -sensu-rabbitmq: - container_name: sensu-rabbitmq - restart: always - image: rabbitmq:3.5.7-management - net: ${CUSTOM_NETWORK_NAME} - expose: - - "5672" - - "5671" - - "15672" - - "15671" + sensu-rabbitmq: + container_name: sensu-rabbitmq + restart: always + image: rabbitmq:3.5.7-management + expose: + - "5672" + - "5671" + - "15672" + - "15671" -sensu-redis: - container_name: sensu-redis - restart: always - image: redis:3.0.7 - net: ${CUSTOM_NETWORK_NAME} - expose: - - "6379" + sensu-redis: + container_name: sensu-redis + restart: always + image: redis:3.0.7 + expose: + - "6379" -sonar-mysql: - container_name: sonar-mysql - restart: always - image: mysql:5.6.25 - net: ${CUSTOM_NETWORK_NAME} - expose: - - "3306" - environment: - MYSQL_ROOT_PASSWORD: ${PASSWORD_SQL} - MYSQL_USER: ${SONAR_MYSQL_USER} - MYSQL_PASSWORD: ${SONAR_MYSQL_PASSWORD} - MYSQL_DATABASE: ${SONAR_MYSQL_DATABASE} + sonar-mysql: + container_name: sonar-mysql + restart: always + image: mysql:5.6.25 + expose: + - "3306" + environment: + MYSQL_ROOT_PASSWORD: ${PASSWORD_SQL} + MYSQL_USER: ${SONAR_MYSQL_USER} + MYSQL_PASSWORD: ${SONAR_MYSQL_PASSWORD} + MYSQL_DATABASE: ${SONAR_MYSQL_DATABASE} -sonar: - container_name: sonar - restart: always - image: accenture/adop-sonar:0.3.5 - #build: ../images/docker-sonar/ - net: ${CUSTOM_NETWORK_NAME} - expose: - - "9000" - environment: - - "dependency:container==sonar-mysql" - - "SONARQUBE_JDBC_USERNAME=${SONAR_MYSQL_USER}" - - "SONARQUBE_JDBC_PASSWORD=${SONAR_MYSQL_PASSWORD}" - - "LDAP_URL=ldap://${LDAP_SERVER}" - - "LDAP_BIND_DN=${LDAP_ADMIN},${LDAP_FULL_DOMAIN}" - - "LDAP_BIND_PASSWORD=${LDAP_PWD}" - - "LDAP_USER_BASE_DN=${LDAP_USER_BASE_DN},${LDAP_FULL_DOMAIN}" - - "LDAP_USER_REQUEST=(&(objectClass=inetOrgPerson)(uid={login}))" - - "LDAP_USER_REAL_NAME_ATTRIBUTE=displayName" - - "LDAP_USER_EMAIL_ATTRIBUTE=mail" - - "LDAP_GROUP_BASE_DN=${LDAP_GROUP_BASE_DN},${LDAP_FULL_DOMAIN}" - - "LDAP_GROUP_REQUEST=(&(objectClass=groupOfUniqueNames)(uniqueMember={dn}))" - - "LDAP_GROUP_ID_ATTRIBUTE=cn" - - "SONARQUBE_JDBC_URL=jdbc:mysql://sonar-mysql:3306/${SONAR_MYSQL_DATABASE}?useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true" + sonar: + container_name: sonar + restart: always + image: accenture/adop-sonar:0.3.5 + #build: ../images/docker-sonar/ + expose: + - "9000" + environment: + - "dependency:container==sonar-mysql" + - "SONARQUBE_JDBC_USERNAME=${SONAR_MYSQL_USER}" + - "SONARQUBE_JDBC_PASSWORD=${SONAR_MYSQL_PASSWORD}" + - "LDAP_URL=ldap://${LDAP_SERVER}" + - "LDAP_BIND_DN=${LDAP_ADMIN},${LDAP_FULL_DOMAIN}" + - "LDAP_BIND_PASSWORD=${LDAP_PWD}" + - "LDAP_USER_BASE_DN=${LDAP_USER_BASE_DN},${LDAP_FULL_DOMAIN}" + - "LDAP_USER_REQUEST=(&(objectClass=inetOrgPerson)(uid={login}))" + - "LDAP_USER_REAL_NAME_ATTRIBUTE=displayName" + - "LDAP_USER_EMAIL_ATTRIBUTE=mail" + - "LDAP_GROUP_BASE_DN=${LDAP_GROUP_BASE_DN},${LDAP_FULL_DOMAIN}" + - "LDAP_GROUP_REQUEST=(&(objectClass=groupOfUniqueNames)(uniqueMember={dn}))" + - "LDAP_GROUP_ID_ATTRIBUTE=cn" + - "SONARQUBE_JDBC_URL=jdbc:mysql://sonar-mysql:3306/${SONAR_MYSQL_DATABASE}?useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true" -jenkins: - container_name: jenkins - restart: always - image: accenture/adop-jenkins:0.2.6 - #build: ../images/docker-jenkins/ - net: ${CUSTOM_NETWORK_NAME} - ports: - - "50000:50000/tcp" - expose: - - "8080" - - "50000" - privileged: true - environment: - JENKINS_OPTS: "--prefix=/jenkins" - ROOT_URL: "${PROTO}://${TARGET_HOST}/jenkins/" - LDAP_SERVER: "${LDAP_SERVER}" - LDAP_ROOTDN: "${LDAP_FULL_DOMAIN}" - LDAP_USER_SEARCH_BASE: "${LDAP_USER_BASE_DN}" - LDAP_USER_SEARCH: "${LDAP_USER_SEARCH}" - LDAP_GROUP_SEARCH_BASE: "${LDAP_GROUP_BASE_DN}" - LDAP_GROUP_SEARCH_FILTER: "" - LDAP_GROUP_MEMBERSHIP_FILTER: "" - LDAP_MANAGER_DN: "${LDAP_MANAGER_DN}" - LDAP_MANAGER_PASSWORD: ${LDAP_PWD} - LDAP_INHIBIT_INFER_ROOTDN: "false" - LDAP_DISABLE_MAIL_ADDRESS_RESOLVER: "false" - LDAP_DISPLAY_NAME_ATTRIBUTE_NAME: "displayName" - LDAP_MAIL_ADDRESS_ATTRIBUTE_NAME: "mail" - LDAP_GROUP_NAME_ADMIN: "${LDAP_GROUP_NAME_ADMIN}" - INITIAL_ADMIN_USER: ${INITIAL_ADMIN_USER} - INITIAL_ADMIN_PASSWORD: ${INITIAL_ADMIN_PASSWORD_PLAIN} - GERRIT_HOST_NAME: "gerrit" - GERRIT_FRONT_END_URL: "http://gerrit:8080/gerrit" - GERRIT_JENKINS_USERNAME: "${GERRIT_JENKINS_USERNAME}" - GERRIT_JENKINS_PASSWORD: ${PASSWORD_JENKINS} - SONAR_SERVER_URL: "http://sonar:9000/sonar/" - SONAR_ACCOUNT_LOGIN: ${SONAR_ACCOUNT_LOGIN} - SONAR_ACCOUNT_PASSWORD: ${PASSWORD_JENKINS} - SONAR_DB_URL: "jdbc:mysql://sonar-mysql:3306/sonar?useUnicode=true&characterEncoding=utf8" - SONAR_DB_LOGIN: ${SONAR_DB_LOGIN} - SONAR_DB_PASSWORD: ${SONAR_DB_PASSWORD} - SONAR_PLUGIN_VERSION: "" - SONAR_ADDITIONAL_PROPS: "" - SONAR_RUNNER_VERSION: "2.4" - ANT_VERSION: "1.9.4" - MAVEN_VERSION: "3.0.5" - NODEJS_VERSION: "6.9.4" - NODEJS_GLOBAL_PACKAGES: "grunt-cli@~0.1.13 bower@~1.3.12 plato@~1.2.1" - NODEJS_PACKAGES_REFRESH_HOURS: "72" - GIT_GLOBAL_CONFIG_NAME: "ADOP Jenkins" - GROOVY_VERSION: "2.4.8" - GIT_GLOBAL_CONFIG_EMAIL: "jenkins@${LDAP_DOMAIN}" - DOCKER_TLS_VERIFY: ${DOCKER_TLS_VERIFY} - DOCKER_HOST: ${DOCKER_HOST} - DOCKER_CLIENT_CERT_PATH: ${DOCKER_CLIENT_CERT_PATH} - DOCKER_NETWORK_NAME: ${CUSTOM_NETWORK_NAME} - CARTRIDGE_SOURCES: ${CARTRIDGE_SOURCES} + jenkins: + container_name: jenkins + restart: always + image: accenture/adop-jenkins:0.2.6 + #build: ../images/docker-jenkins/ + ports: + - "50000:50000/tcp" + expose: + - "8080" + - "50000" + privileged: true + environment: + JENKINS_OPTS: "--prefix=/jenkins" + ROOT_URL: "${PROTO}://${TARGET_HOST}/jenkins/" + LDAP_SERVER: "${LDAP_SERVER}" + LDAP_ROOTDN: "${LDAP_FULL_DOMAIN}" + LDAP_USER_SEARCH_BASE: "${LDAP_USER_BASE_DN}" + LDAP_USER_SEARCH: "${LDAP_USER_SEARCH}" + LDAP_GROUP_SEARCH_BASE: "${LDAP_GROUP_BASE_DN}" + LDAP_GROUP_SEARCH_FILTER: "" + LDAP_GROUP_MEMBERSHIP_FILTER: "" + LDAP_MANAGER_DN: "${LDAP_MANAGER_DN}" + LDAP_MANAGER_PASSWORD: ${LDAP_PWD} + LDAP_INHIBIT_INFER_ROOTDN: "false" + LDAP_DISABLE_MAIL_ADDRESS_RESOLVER: "false" + LDAP_DISPLAY_NAME_ATTRIBUTE_NAME: "displayName" + LDAP_MAIL_ADDRESS_ATTRIBUTE_NAME: "mail" + LDAP_GROUP_NAME_ADMIN: "${LDAP_GROUP_NAME_ADMIN}" + INITIAL_ADMIN_USER: ${INITIAL_ADMIN_USER} + INITIAL_ADMIN_PASSWORD: ${INITIAL_ADMIN_PASSWORD_PLAIN} + GERRIT_HOST_NAME: "gerrit" + GERRIT_FRONT_END_URL: "http://gerrit:8080/gerrit" + GERRIT_JENKINS_USERNAME: "${GERRIT_JENKINS_USERNAME}" + GERRIT_JENKINS_PASSWORD: ${PASSWORD_JENKINS} + SONAR_SERVER_URL: "http://sonar:9000/sonar/" + SONAR_ACCOUNT_LOGIN: ${SONAR_ACCOUNT_LOGIN} + SONAR_ACCOUNT_PASSWORD: ${PASSWORD_JENKINS} + SONAR_DB_URL: "jdbc:mysql://sonar-mysql:3306/sonar?useUnicode=true&characterEncoding=utf8" + SONAR_DB_LOGIN: ${SONAR_DB_LOGIN} + SONAR_DB_PASSWORD: ${SONAR_DB_PASSWORD} + SONAR_PLUGIN_VERSION: "" + SONAR_ADDITIONAL_PROPS: "" + SONAR_RUNNER_VERSION: "2.4" + ANT_VERSION: "1.9.4" + MAVEN_VERSION: "3.0.5" + NODEJS_VERSION: "6.9.4" + NODEJS_GLOBAL_PACKAGES: "grunt-cli@~0.1.13 bower@~1.3.12 plato@~1.2.1" + NODEJS_PACKAGES_REFRESH_HOURS: "72" + GIT_GLOBAL_CONFIG_NAME: "ADOP Jenkins" + GROOVY_VERSION: "2.4.8" + GIT_GLOBAL_CONFIG_EMAIL: "jenkins@${LDAP_DOMAIN}" + DOCKER_TLS_VERIFY: ${DOCKER_TLS_VERIFY} + DOCKER_HOST: ${DOCKER_HOST} + DOCKER_CLIENT_CERT_PATH: ${DOCKER_CLIENT_CERT_PATH} + DOCKER_NETWORK_NAME: ${CUSTOM_NETWORK_NAME} + CARTRIDGE_SOURCES: ${CARTRIDGE_SOURCES} -jenkins-slave: - container_name: jenkins-slave - restart: always - image: accenture/adop-jenkins-slave:0.1.4 - net: ${CUSTOM_NETWORK_NAME} - privileged: true - environment: - SLAVE_LABELS: "aws ldap java8 docker" - SWARM_PASSWORD: ${PASSWORD_JENKINS} - SLAVE_EXECUTORS: ${SLAVE_EXECUTORS} - INITIAL_ADMIN_USER: ${INITIAL_ADMIN_USER} - INITIAL_ADMIN_PASSWORD: ${INITIAL_ADMIN_PASSWORD_PLAIN} + jenkins-slave: + container_name: jenkins-slave + restart: always + image: accenture/adop-jenkins-slave:0.1.4 + privileged: true + environment: + SLAVE_LABELS: "aws ldap java8 docker" + SWARM_PASSWORD: ${PASSWORD_JENKINS} + SLAVE_EXECUTORS: ${SLAVE_EXECUTORS} + INITIAL_ADMIN_USER: ${INITIAL_ADMIN_USER} + INITIAL_ADMIN_PASSWORD: ${INITIAL_ADMIN_PASSWORD_PLAIN} -selenium-hub: - container_name: selenium-hub - restart: always - image: selenium/hub:2.53.0 - net: ${CUSTOM_NETWORK_NAME} - expose: - - "4444" + selenium-hub: + container_name: selenium-hub + restart: always + image: selenium/hub:2.53.0 + expose: + - "4444" -selenium-node-chrome: - container_name: selenium-node-chrome - restart: always - image: selenium/node-chrome:2.53.0 - net: ${CUSTOM_NETWORK_NAME} - environment: - SE_OPTS: "-nodeConfig /var/selenium-config/config-chrome.json" - REMOTE_HOST: "http://selenium-node-chrome:5555" - HUB_PORT_4444_TCP_ADDR: "selenium-hub" - HUB_PORT_4444_TCP_PORT: "4444" + selenium-node-chrome: + container_name: selenium-node-chrome + restart: always + image: selenium/node-chrome:2.53.0 + environment: + SE_OPTS: "-nodeConfig /var/selenium-config/config-chrome.json" + REMOTE_HOST: "http://selenium-node-chrome:5555" + HUB_PORT_4444_TCP_ADDR: "selenium-hub" + HUB_PORT_4444_TCP_PORT: "4444" -selenium-node-firefox: - container_name: selenium-node-firefox - restart: always - image: selenium/node-firefox:2.53.0 - net: ${CUSTOM_NETWORK_NAME} - environment: - SE_OPTS: "-nodeConfig /var/selenium-config/config-firefox.json" - REMOTE_HOST: "http://selenium-node-firefox:5555" - HUB_PORT_4444_TCP_ADDR: "selenium-hub" - HUB_PORT_4444_TCP_PORT: "4444" + selenium-node-firefox: + container_name: selenium-node-firefox + restart: always + image: selenium/node-firefox:2.53.0 + environment: + SE_OPTS: "-nodeConfig /var/selenium-config/config-firefox.json" + REMOTE_HOST: "http://selenium-node-firefox:5555" + HUB_PORT_4444_TCP_ADDR: "selenium-hub" + HUB_PORT_4444_TCP_PORT: "4444" -nexus: - container_name: nexus - restart: always - image: accenture/adop-nexus:0.1.4 - net: ${CUSTOM_NETWORK_NAME} - expose: - - "8081" - environment: - NEXUS_BASE_URL: "${PROTO}://${TARGET_HOST}/nexus" - LDAP_SEARCH_BASE: "${LDAP_FULL_DOMAIN}" - LDAP_ENABLED: "true" - LDAP_URL: "ldap" - LDAP_BIND_DN: "${LDAP_ADMIN},${LDAP_FULL_DOMAIN}" - LDAP_USER_PASSWORD_ATTRIBUTE: "userPassword" - LDAP_USER_BASE_DN: "${LDAP_USER_BASE_DN}" - LDAP_GROUP_BASE_DN: "${LDAP_GROUP_BASE_DN}" - LDAP_BIND_PASSWORD: ${LDAP_PWD} + nexus: + container_name: nexus + restart: always + image: accenture/adop-nexus:0.1.4 + expose: + - "8081" + environment: + NEXUS_BASE_URL: "${PROTO}://${TARGET_HOST}/nexus" + LDAP_SEARCH_BASE: "${LDAP_FULL_DOMAIN}" + LDAP_ENABLED: "true" + LDAP_URL: "ldap" + LDAP_BIND_DN: "${LDAP_ADMIN},${LDAP_FULL_DOMAIN}" + LDAP_USER_PASSWORD_ATTRIBUTE: "userPassword" + LDAP_USER_BASE_DN: "${LDAP_USER_BASE_DN}" + LDAP_GROUP_BASE_DN: "${LDAP_GROUP_BASE_DN}" + LDAP_BIND_PASSWORD: ${LDAP_PWD} -ldap-ltb: - container_name: ldap-ltb - restart: always - image: accenture/adop-ldap-ltb:0.1.0 - net: ${CUSTOM_NETWORK_NAME} - expose: - - "80" - environment: - LDAP_LTB_URL: "ldap://${LDAP_SERVER}" - LDAP_LTB_DN: "${LDAP_ADMIN},${LDAP_FULL_DOMAIN}" - LDAP_LTB_PWD: "${LDAP_PWD}" - LDAP_LTB_BS: "${LDAP_FULL_DOMAIN}" + ldap-ltb: + container_name: ldap-ltb + restart: always + image: accenture/adop-ldap-ltb:0.1.0 + expose: + - "80" + environment: + LDAP_LTB_URL: "ldap://${LDAP_SERVER}" + LDAP_LTB_DN: "${LDAP_ADMIN},${LDAP_FULL_DOMAIN}" + LDAP_LTB_PWD: "${LDAP_PWD}" + LDAP_LTB_BS: "${LDAP_FULL_DOMAIN}" -ldap-phpadmin: - container_name: ldap-phpadmin - restart: always - image: accenture/adop-ldap-phpadmin:0.1.0 - net: ${CUSTOM_NETWORK_NAME} - expose: - - "80" - environment: - LDAP_SERVER_NAME: "LDAP" - LDAP_SERVER_HOST: "ldap" - LDAP_SERVER_PORT: "389" - LDAP_SERVER_BIND_ID: "${LDAP_ADMIN},${LDAP_FULL_DOMAIN}" - LDAP_SERVER_BASE_DN: "${LDAP_FULL_DOMAIN}" + ldap-phpadmin: + container_name: ldap-phpadmin + restart: always + image: accenture/adop-ldap-phpadmin:0.1.0 + expose: + - "80" + environment: + LDAP_SERVER_NAME: "LDAP" + LDAP_SERVER_HOST: "ldap" + LDAP_SERVER_PORT: "389" + LDAP_SERVER_BIND_ID: "${LDAP_ADMIN},${LDAP_FULL_DOMAIN}" + LDAP_SERVER_BASE_DN: "${LDAP_FULL_DOMAIN}" -registry: - container_name: registry - restart: always - image: registry:2.5.1 - net: ${CUSTOM_NETWORK_NAME} - expose: - - "5000" - environment: - REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY: /data - REGISTRY_HTTP_TLS_CERTIFICATE: /certs/registry/fullchain.pem - REGISTRY_HTTP_TLS_KEY: /certs/registry/privkey.pem + registry: + container_name: registry + restart: always + image: registry:2.5.1 + expose: + - "5000" + environment: + REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY: /data + REGISTRY_HTTP_TLS_CERTIFICATE: /certs/registry/fullchain.pem + REGISTRY_HTTP_TLS_KEY: /certs/registry/privkey.pem + +networks: + default: + external: + name: ${CUSTOM_NETWORK_NAME} diff --git a/etc/aws/default.yml b/etc/aws/default.yml index 5ccb75924..e72a60602 100644 --- a/etc/aws/default.yml +++ b/etc/aws/default.yml @@ -1,9 +1,11 @@ # Override file to pass in AWS specific env variables to jenkins +version: "3" -jenkins: - environment: - AWS_KEYPAIR: "${AWS_KEYPAIR}" - AWS_VPC_ID: "${AWS_VPC_ID}" - AWS_SUBNET_ID: "${AWS_SUBNET_ID}" - AWS_INSTANCE_TYPE: "${AWS_INSTANCE_TYPE}" - AWS_DEFAULT_REGION: "${AWS_DEFAULT_REGION}" +services: + jenkins: + environment: + AWS_KEYPAIR: "${AWS_KEYPAIR}" + AWS_VPC_ID: "${AWS_VPC_ID}" + AWS_SUBNET_ID: "${AWS_SUBNET_ID}" + AWS_INSTANCE_TYPE: "${AWS_INSTANCE_TYPE}" + AWS_DEFAULT_REGION: "${AWS_DEFAULT_REGION}" diff --git a/etc/logging/syslog/default.yml b/etc/logging/syslog/default.yml index 24cb87fab..aafee7d7f 100644 --- a/etc/logging/syslog/default.yml +++ b/etc/logging/syslog/default.yml @@ -1,115 +1,136 @@ # set LOGSTASH_HOST to dns/ip of logstash host - -proxy: - log_driver: "syslog" - log_opt: - syslog-address: "udp://${LOGSTASH_HOST}:25826" - tag: "proxy" - -ldap: - log_driver: "syslog" - log_opt: - syslog-address: "udp://${LOGSTASH_HOST}:25826" - tag: "ldap" - -gerrit-mysql: - log_driver: "syslog" - log_opt: - syslog-address: "udp://${LOGSTASH_HOST}:25826" - tag: "gerrit-mysql" - -gerrit: - log_driver: "syslog" - log_opt: - syslog-address: "udp://${LOGSTASH_HOST}:25826" - tag: "gerrit" - -sensu-uchiwa: - log_driver: "syslog" - log_opt: - syslog-address: "udp://${LOGSTASH_HOST}:25826" - tag: "sensu-uchiwa" - -sensu-api: - log_driver: "syslog" - log_opt: - syslog-address: "udp://${LOGSTASH_HOST}:25826" - tag: "sensu-api" - -sensu-server: - log_driver: "syslog" - log_opt: - syslog-address: "udp://${LOGSTASH_HOST}:25826" - tag: "sensu-server" - -sensu-client: - log_driver: "syslog" - log_opt: - syslog-address: "udp://${LOGSTASH_HOST}:25826" - tag: "sensu-client" - -sensu-rabbitmq: - log_driver: "syslog" - log_opt: - syslog-address: "udp://${LOGSTASH_HOST}:25826" - tag: "sensu-rabbitmq" - -sensu-redis: - log_driver: "syslog" - log_opt: - syslog-address: "udp://${LOGSTASH_HOST}:25826" - tag: "sensu-redis" - -sonar-mysql: - log_driver: "syslog" - log_opt: - syslog-address: "udp://${LOGSTASH_HOST}:25826" - tag: "sonar-mysql" - -sonar: - log_driver: "syslog" - log_opt: - syslog-address: "udp://${LOGSTASH_HOST}:25826" - tag: "sonar" - -jenkins: - log_driver: "syslog" - log_opt: - syslog-address: "udp://${LOGSTASH_HOST}:25826" - tag: "jenkins" - -jenkins-slave: - log_driver: "syslog" - log_opt: - syslog-address: "udp://${LOGSTASH_HOST}:25826" - tag: "jenkins-slave" - -selenium-hub: - log_driver: "syslog" - log_opt: - syslog-address: "udp://${LOGSTASH_HOST}:25826" - tag: "selenium-hub" - -selenium-node-chrome: - log_driver: "syslog" - log_opt: - syslog-address: "udp://${LOGSTASH_HOST}:25826" - tag: "selenium-node-chrome" - -selenium-node-firefox: - log_driver: "syslog" - log_opt: - syslog-address: "udp://${LOGSTASH_HOST}:25826" - tag: "selenium-node-firefox" - -nexus: - log_driver: "syslog" - log_opt: - syslog-address: "udp://${LOGSTASH_HOST}:25826" - tag: "nexus" - -registry: - log_driver: "syslog" - log_opt: - syslog-address: "udp://${LOGSTASH_HOST}:25826" - tag: "registry" +version: "3" + +services: + proxy: + logging: + driver: "syslog" + options: + syslog-address: "udp://${LOGSTASH_HOST}:25826" + tag: "proxy" + + ldap: + logging: + driver: "syslog" + options: + syslog-address: "udp://${LOGSTASH_HOST}:25826" + tag: "ldap" + + gerrit-mysql: + logging: + driver: "syslog" + options: + syslog-address: "udp://${LOGSTASH_HOST}:25826" + tag: "gerrit-mysql" + + gerrit: + logging: + driver: "syslog" + options: + syslog-address: "udp://${LOGSTASH_HOST}:25826" + tag: "gerrit" + + sensu-uchiwa: + logging: + driver: "syslog" + options: + syslog-address: "udp://${LOGSTASH_HOST}:25826" + tag: "sensu-uchiwa" + + sensu-api: + logging: + driver: "syslog" + options: + syslog-address: "udp://${LOGSTASH_HOST}:25826" + tag: "sensu-api" + + sensu-server: + logging: + driver: "syslog" + options: + syslog-address: "udp://${LOGSTASH_HOST}:25826" + tag: "sensu-server" + + sensu-client: + logging: + driver: "syslog" + options: + syslog-address: "udp://${LOGSTASH_HOST}:25826" + tag: "sensu-client" + + sensu-rabbitmq: + logging: + driver: "syslog" + options: + syslog-address: "udp://${LOGSTASH_HOST}:25826" + tag: "sensu-rabbitmq" + + sensu-redis: + logging: + driver: "syslog" + options: + syslog-address: "udp://${LOGSTASH_HOST}:25826" + tag: "sensu-redis" + + sonar-mysql: + logging: + driver: "syslog" + options: + syslog-address: "udp://${LOGSTASH_HOST}:25826" + tag: "sonar-mysql" + + sonar: + logging: + driver: "syslog" + options: + syslog-address: "udp://${LOGSTASH_HOST}:25826" + tag: "sonar" + + jenkins: + logging: + driver: "syslog" + options: + syslog-address: "udp://${LOGSTASH_HOST}:25826" + tag: "jenkins" + + jenkins-slave: + logging: + driver: "syslog" + options: + syslog-address: "udp://${LOGSTASH_HOST}:25826" + tag: "jenkins-slave" + + selenium-hub: + logging: + driver: "syslog" + options: + syslog-address: "udp://${LOGSTASH_HOST}:25826" + tag: "selenium-hub" + + selenium-node-chrome: + logging: + driver: "syslog" + options: + syslog-address: "udp://${LOGSTASH_HOST}:25826" + tag: "selenium-node-chrome" + + selenium-node-firefox: + logging: + driver: "syslog" + options: + syslog-address: "udp://${LOGSTASH_HOST}:25826" + tag: "selenium-node-firefox" + + nexus: + logging: + driver: "syslog" + options: + syslog-address: "udp://${LOGSTASH_HOST}:25826" + tag: "nexus" + + registry: + logging: + driver: "syslog" + options: + syslog-address: "udp://${LOGSTASH_HOST}:25826" + tag: "registry" diff --git a/etc/volumes/local/default.yml b/etc/volumes/local/default.yml index 01d42fe0a..068dac8e8 100644 --- a/etc/volumes/local/default.yml +++ b/etc/volumes/local/default.yml @@ -1,69 +1,45 @@ -proxy: - volumes: - - nginx_config:/etc/nginx - - nginx_releasenote:/usr/share/nginx/html - -ldap: - volumes: - - ldap_db:/var/lib/ldap - - ldap_static:/etc/ldap - -gerrit-mysql: - volumes: - - gerrit_mysql_data:/var/lib/mysql - -gerrit: - user: root - volumes: - - git_repos:/var/git/repos - - gerrit_review_site:/var/gerrit/review_site - -sensu-api: - volumes: - - sensu_api_conf:/etc/sensu/conf.d - -sensu-server: - volumes: - - sensu_server_conf:/etc/sensu/conf.d - -sensu-client: - volumes: - - sensu_client_conf:/etc/sensu/conf.d - -sensu-rabbitmq: - volumes: - - sensu_rabbitmq_data:/var/lib/rabbitmq - -sensu-redis: - volumes: - - sensu_redis_data:/data - -sonar-mysql: - volumes: - - sonar_mysql_data:/var/lib/mysql - -sonar: - volumes: - - sonar_data:/opt/sonarqube/data - - sonar_extensions:/opt/sonarqube/extensions - - sonar_logs:/opt/sonarqube/logs - -jenkins-slave: - volumes: - - jenkins_slave_home:/workspace - - /var/run/docker.sock:/var/run/docker.sock - -jenkins: - user: root - volumes: - - jenkins_home:/var/jenkins_home - - /var/run/docker.sock:/var/run/docker.sock - -nexus: - volumes: - - nexus_sonatype_work:/sonatype-work - -registry: - volumes: - - registry_certs:/certs - - registry_data:/data +version: "3" + +volumes: + nginx_config: + driver: local + nginx_releasenote: + driver: local + ldap_db: + driver: local + ldap_static: + driver: local + gerrit_mysql_data: + driver: local + git_repos: + driver: local + gerrit_review_site: + driver: local + sensu_api_conf: + driver: local + sensu_server_conf: + driver: local + sensu_client_conf: + driver: local + sensu_rabbitmq_data: + driver: local + sensu_redis_data: + driver: local + sonar_mysql_data: + driver: local + sonar_data: + driver: local + sonar_extensions: + driver: local + sonar_logs: + driver: local + jenkins_home: + driver: local + jenkins_slave_home: + driver: local + nexus_sonatype_work: + driver: local + registry_certs: + driver: local + registry_data: + driver: local diff --git a/etc/volumes/nfs/default.yml b/etc/volumes/nfs/default.yml index e543ee147..83d36ae1b 100644 --- a/etc/volumes/nfs/default.yml +++ b/etc/volumes/nfs/default.yml @@ -1,87 +1,129 @@ -proxy: - volume_driver: nfs - volumes: - - ${NFS_HOST}/nfs/nginx_config:/etc/nginx - - ${NFS_HOST}/nfs/nginx_releasenote:/usr/share/nginx/html +version: "3" -ldap: - volume_driver: nfs - volumes: - - ${NFS_HOST}/nfs/ldap_db:/var/lib/ldap - - ${NFS_HOST}/nfs/ldap_static:/etc/ldap - -gerrit-mysql: - volume_driver: nfs - volumes: - - ${NFS_HOST}/nfs/gerrit_mysql_data:/var/lib/mysql - -gerrit: - user: root - volume_driver: nfs - volumes: - - ${NFS_HOST}/nfs/git_repos:/var/git/repos - - ${NFS_HOST}/nfs/gerrit_review_site:/var/gerrit/review_site - -sensu-api: - volume_driver: nfs - volumes: - - ${NFS_HOST}/nfs/sensu_api_conf:/etc/sensu/conf.d - -sensu-server: - volume_driver: nfs - volumes: - - ${NFS_HOST}/nfs/sensu_server_conf:/etc/sensu/conf.d - -sensu-client: - volume_driver: nfs - volumes: - - ${NFS_HOST}/nfs/sensu_client_conf:/etc/sensu/conf.d - -sensu-rabbitmq: - volume_driver: nfs - volumes: - - ${NFS_HOST}/nfs/sensu_rabbitmq_data:/var/lib/rabbitmq - -sensu-redis: - volume_driver: nfs - volumes: - - ${NFS_HOST}/nfs/sensu_redis_data:/data - -sonar-mysql: - volume_driver: nfs - volumes: - - ${NFS_HOST}/nfs/sonar_mysql_data:/var/lib/mysql - -sonar: - volume_driver: nfs - volumes: - - ${NFS_HOST}/nfs/sonar_data:/opt/sonarqube/data - - ${NFS_HOST}/nfs/sonar_extensions:/opt/sonarqube/extensions - - ${NFS_HOST}/nfs/sonar_logs:/opt/sonarqube/logs - -jenkins: - user: root - volume_driver: nfs - volumes: - - ${NFS_HOST}/nfs/jenkins_home:/var/jenkins_home - -selenium-node-chrome: - volume_driver: nfs - volumes: - - ${NFS_HOST}/nfs/selenium_config:/var/selenium-config - -selenium-node-firefox: - volume_driver: nfs - volumes: - - ${NFS_HOST}/nfs/selenium_config:/var/selenium-config - -nexus: - volume_driver: nfs - volumes: - - ${NFS_HOST}/nfs/nexus_sonatype_work:/sonatype-work - -registry: - volume_driver: nfs - volumes: - - ${NFS_HOST}/nfs/registry_certs:/certs - - ${NFS_HOST}/nfs/registry_data:/data +volumes: + nginx_config: + driver: local + driver_opts: + type: nfs + o=addr: "${NFS_HOST},rw" + device: /nfs/nginx_config + nginx_releasenote: + driver: local + driver_opts: + type: nfs + o=addr: "${NFS_HOST},rw" + device: /nfs/nginx_releasenote + ldap_db: + driver: local + driver_opts: + type: nfs + o=addr: "${NFS_HOST},rw" + device: /nfs/ldap_db + ldap_static: + driver: local + driver_opts: + type: nfs + o=addr: "${NFS_HOST},rw" + device: /nfs/ldap_static + gerrit_mysql_data: + driver: local + driver_opts: + type: nfs + o=addr: "${NFS_HOST},rw" + device: /nfs/gerrit_mysql_data + git_repos: + driver: local + driver_opts: + type: nfs + o=addr: "${NFS_HOST},rw" + device: /nfs/git_repos + gerrit_review_site: + driver: local + driver_opts: + type: nfs + o=addr: "${NFS_HOST},rw" + device: /nfs/gerrit_review_site + sensu_api_conf: + driver: local + driver_opts: + type: nfs + o=addr: "${NFS_HOST},rw" + device: /nfs/sensu_api_conf + sensu_server_conf: + driver: local + driver_opts: + type: nfs + o=addr: "${NFS_HOST},rw" + device: /nfs/sensu_server_conf + sensu_client_conf: + driver: local + driver_opts: + type: nfs + o=addr: "${NFS_HOST},rw" + device: /nfs/sensu_client_conf + sensu_rabbitmq_data: + driver: local + driver_opts: + type: nfs + o=addr: "${NFS_HOST},rw" + device: /nfs/sensu_rabbitmq_data + sensu_redis_data: + driver: local + driver_opts: + type: nfs + o=addr: "${NFS_HOST},rw" + device: /nfs/sensu_redis_data + sonar_mysql_data: + driver: local + driver_opts: + type: nfs + o=addr: "${NFS_HOST},rw" + device: /nfs/sonar_mysql_data + sonar_data: + driver: local + driver_opts: + type: nfs + o=addr: "${NFS_HOST},rw" + device: /nfs/sonar_data + sonar_extensions: + driver: local + driver_opts: + type: nfs + o=addr: "${NFS_HOST},rw" + device: /nfs/sonar_extensions + sonar_logs: + driver: local + driver_opts: + type: nfs + o=addr: "${NFS_HOST},rw" + device: /nfs/sonar_logs + jenkins_home: + driver: local + driver_opts: + type: nfs + o=addr: "${NFS_HOST},rw" + device: /nfs/jenkins_home + jenkins_slave_home: + driver: local + driver_opts: + type: nfs + o=addr: "${NFS_HOST},rw" + device: /nfs/jenkins_slave_home + nexus_sonatype_work: + driver: local + driver_opts: + type: nfs + o=addr: "${NFS_HOST},rw" + device: /nfs/nexus_sonatype_work + registry_certs: + driver: local + driver_opts: + type: nfs + o=addr: "${NFS_HOST},rw" + device: /nfs/registry_certs + registry_data: + driver: local + driver_opts: + type: nfs + o=addr: "${NFS_HOST},rw" + device: /nfs/registry_data