diff --git a/PORTS b/PORTS index 23b3853..bba5ae1 100644 --- a/PORTS +++ b/PORTS @@ -1,46 +1,46 @@ reserved-for-legacy-docker-migration-medium-priority 3000 Mastodon public HTTP 4000 Mastodon streaming HTTP 15674 RabbitMQ 41080 Nasqueron Tools HTTP reserved-for-legacy-docker-migration-low-priority 4440 Rundeck HTTP 21080 Drupal CRM HTTP 22080 Zammad HTTP 27080 Grafana HTTP 28080 phragile HTTP 29080 etcd HTTP 32080 Discourse HTTP 40080 RocketChat HTTP paas-docker 5000 Docker registry HTTP 9090 Openfire HTTP 19080 Nasqueron API - Datasources 20080 Nasqueron API - Docker registry API 22220 Phabricator Aphlict (client) 22221 Phabricator Aphlict (admin) 23080 Phabricator HTTP - River Sector 24080 Tommy HTTP - CI 24180 Tommy HTTP - CD 25080 Auth Grove HTTP 26080 Sentry HTTP 30080 Pixelfed HTTP 31080 Phabricator HTTP - DevCentral 33080 Bugzilla HTTP - Espace Win 34080 Etherpad 35080 Phabricator HTTP - Wolfplex 36080 Phabricator HTTP - Zed 37080 Notifications center HTTP 38080 Jenkins HTTP - CD 39080 Cachet HTTP 41080 ACME DNS server HTTP 42080 Jenkins HTTP - CI 43080 Hauk 44080 Hound # 45080 should be reserved for OpenGrok to compare with Hound 47080 Jenkins HTTP - Test - 50000 Jenkins master's port for JNLP-based Jenkins agents - CD - 52000 Jenkins master's port for JNLP-based Jenkins agents - Test - 55000 Jenkins master's port for JNKP-based Jenkins agents - CI + 50000 Jenkins controller's port for JNLP-based Jenkins agents - CD + 52000 Jenkins controller's port for JNLP-based Jenkins agents - Test + 55000 Jenkins controller's port for JNKP-based Jenkins agents - CI diff --git a/roles/paas-docker/containers/jenkins.sls b/roles/paas-docker/containers/jenkins.sls index efcf199..ad3f483 100644 --- a/roles/paas-docker/containers/jenkins.sls +++ b/roles/paas-docker/containers/jenkins.sls @@ -1,57 +1,57 @@ # ------------------------------------------------------------- # Salt — Provision Docker engine # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Project: Nasqueron # Created: 2018-03-11 # License: Trivial work, not eligible to copyright # ------------------------------------------------------------- {% set has_selinux = salt['grains.get']('selinux:enabled', False) %} {% set containers = pillar['docker_containers'][grains['id']] %} {% for instance, container in containers['jenkins'].items() %} {% set realm = pillar['jenkins_realms'][container['realm']] %} {% set home = "/srv/jenkins/" + container['realm'] + "/jenkins_home" %} # ------------------------------------------------------------- # Home directory # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ home }}: file.directory: - user: 1000 - group: 1000 - makedirs: True {% if has_selinux %} selinux_context_jenkins_home_{{ instance }}: selinux.fcontext_policy_present: - name: {{ home }} - sel_type: container_file_t selinux_context_jenkins_home_applied_{{ instance }}: selinux.fcontext_policy_applied: - name: {{ home }} {% endif %} # ------------------------------------------------------------- # Container # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {{ instance }}: docker_container.running: - detach: True - interactive: True - image: jenkins/jenkins - binds: {{ home }}:/var/jenkins_home - networks: - {{ realm['network'] }} - ports: - 8080 - 50000 - port_bindings: - {{ container['app_port'] }}:8080 # HTTP - - {{ container['jnlp_port'] }}:50000 # Jenkins master's port for JNLP-based Jenkins agents + - {{ container['jnlp_port'] }}:50000 # Jenkins controller's port for JNLP-based Jenkins agents {% endfor %}