1
0
mirror of https://github.com/ansible/awx.git synced 2024-11-02 01:21:21 +03:00

Merge pull request #2788 from AlanCoding/container_names

Set fixed container names

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot] 2018-11-26 18:53:41 +00:00 committed by GitHub
commit 9eb2c02e92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 1 deletions

View File

@ -4,6 +4,7 @@ services:
build: build:
context: ./docker-compose context: ./docker-compose
dockerfile: Dockerfile-haproxy dockerfile: Dockerfile-haproxy
container_name: tools_haproxy_1
depends_on: depends_on:
- "awx_1" - "awx_1"
- "awx_2" - "awx_2"
@ -15,6 +16,7 @@ services:
- "15672:15672" - "15672:15672"
awx_1: awx_1:
user: ${CURRENT_UID} user: ${CURRENT_UID}
container_name: tools_awx_1_1
privileged: true privileged: true
image: ${DEV_DOCKER_TAG_BASE}/awx_devel:${TAG} image: ${DEV_DOCKER_TAG_BASE}/awx_devel:${TAG}
hostname: awx_1 hostname: awx_1
@ -32,6 +34,7 @@ services:
- "5899-5999:5899-5999" - "5899-5999:5899-5999"
awx_2: awx_2:
user: ${CURRENT_UID} user: ${CURRENT_UID}
container_name: tools_awx_2_1
privileged: true privileged: true
image: ${DEV_DOCKER_TAG_BASE}/awx_devel:${TAG} image: ${DEV_DOCKER_TAG_BASE}/awx_devel:${TAG}
hostname: awx_2 hostname: awx_2
@ -49,6 +52,7 @@ services:
- "6899-6999:6899-6999" - "6899-6999:6899-6999"
awx_3: awx_3:
user: ${CURRENT_UID} user: ${CURRENT_UID}
container_name: tools_awx_3_1
privileged: true privileged: true
image: ${DEV_DOCKER_TAG_BASE}/awx_devel:${TAG} image: ${DEV_DOCKER_TAG_BASE}/awx_devel:${TAG}
hostname: awx_3 hostname: awx_3
@ -67,19 +71,24 @@ services:
rabbitmq_1: rabbitmq_1:
image: ${DEV_DOCKER_TAG_BASE}/rabbit_cluster_node:latest image: ${DEV_DOCKER_TAG_BASE}/rabbit_cluster_node:latest
hostname: rabbitmq_1 hostname: rabbitmq_1
container_name: tools_rabbitmq_1_1
rabbitmq_2: rabbitmq_2:
image: ${DEV_DOCKER_TAG_BASE}/rabbit_cluster_node:latest image: ${DEV_DOCKER_TAG_BASE}/rabbit_cluster_node:latest
hostname: rabbitmq_2 hostname: rabbitmq_2
container_name: tools_rabbitmq_2_1
environment: environment:
- CLUSTERED=true - CLUSTERED=true
- CLUSTER_WITH=rabbitmq_1 - CLUSTER_WITH=rabbitmq_1
rabbitmq_3: rabbitmq_3:
image: ${DEV_DOCKER_TAG_BASE}/rabbit_cluster_node:latest image: ${DEV_DOCKER_TAG_BASE}/rabbit_cluster_node:latest
hostname: rabbitmq_3 hostname: rabbitmq_3
container_name: tools_rabbitmq_3_1
environment: environment:
- CLUSTERED=true - CLUSTERED=true
- CLUSTER_WITH=rabbitmq_1 - CLUSTER_WITH=rabbitmq_1
postgres: postgres:
image: postgres:9.6 image: postgres:9.6
container_name: tools_postgres_1
memcached: memcached:
image: memcached:alpine image: memcached:alpine
container_name: tools_memcached_1

View File

@ -4,6 +4,7 @@ services:
awx: awx:
user: ${CURRENT_UID} user: ${CURRENT_UID}
image: ${DEV_DOCKER_TAG_BASE}/awx_devel:${TAG} image: ${DEV_DOCKER_TAG_BASE}/awx_devel:${TAG}
container_name: tools_awx_1
hostname: awx hostname: awx
environment: environment:
RABBITMQ_HOST: rabbitmq RABBITMQ_HOST: rabbitmq
@ -37,13 +38,16 @@ services:
# Postgres Database Container # Postgres Database Container
postgres: postgres:
image: postgres:9.6 image: postgres:9.6
container_name: tools_postgres_1
ports: ports:
- "5432:5432" - "5432:5432"
memcached: memcached:
image: memcached:alpine image: memcached:alpine
container_name: tools_memcached_1
ports: ports:
- "11211:11211" - "11211:11211"
rabbitmq: rabbitmq:
image: rabbitmq:3-management image: rabbitmq:3-management
container_name: tools_rabbitmq_1
ports: ports:
- "15672:15672" - "15672:15672"

View File

@ -1,4 +1,4 @@
version: '3' version: '2'
services: services:
# Primary Tower Development Container link # Primary Tower Development Container link
awx: awx:
@ -9,6 +9,7 @@ services:
# Isolated Rampart Container # Isolated Rampart Container
isolated: isolated:
image: ${DEV_DOCKER_TAG_BASE}/awx_isolated:${TAG} image: ${DEV_DOCKER_TAG_BASE}/awx_isolated:${TAG}
container_name: tools_isolated_1
hostname: isolated hostname: isolated
volumes: volumes:
- "../awx/main/expect:/awx_devel" - "../awx/main/expect:/awx_devel"