diff --git a/.env.example b/.env.example index 3508b6e7..b5760c2b 100644 --- a/.env.example +++ b/.env.example @@ -1,12 +1,3 @@ -# Container names -NGINX_CONTAINER_NAME=nginx -REDIS_CONTAINER_NAME=redis -POSTGRESQL_CONTAINER_NAME=db -SOLR_CONTAINER_NAME=solr -DATAPUSHER_CONTAINER_NAME=datapusher -CKAN_CONTAINER_NAME=ckan -WORKER_CONTAINER_NAME=ckan-worker - # Host Ports CKAN_PORT_HOST=5000 NGINX_PORT_HOST=81 diff --git a/docker-compose.yml b/docker-compose.yml index 0f5330fb..4f004d71 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,7 +9,6 @@ volumes: services: nginx: - container_name: ${NGINX_CONTAINER_NAME} build: context: nginx/ dockerfile: Dockerfile @@ -23,7 +22,6 @@ services: - "0.0.0.0:${NGINX_SSLPORT_HOST}:${NGINX_SSLPORT}" ckan: - container_name: ${CKAN_CONTAINER_NAME} build: context: ckan/ dockerfile: Dockerfile @@ -50,7 +48,6 @@ services: test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:5000"] datapusher: - container_name: ${DATAPUSHER_CONTAINER_NAME} networks: - ckannet - dbnet @@ -60,7 +57,6 @@ services: test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:8800"] db: - container_name: ${POSTGRESQL_CONTAINER_NAME} build: context: postgresql/ networks: @@ -82,7 +78,6 @@ services: test: ["CMD", "pg_isready", "-U", "${POSTGRES_USER}", "-d", "${POSTGRES_DB}"] solr: - container_name: ${SOLR_CONTAINER_NAME} networks: - solrnet image: ckan/ckan-solr:${SOLR_IMAGE_VERSION} @@ -93,7 +88,6 @@ services: test: ["CMD", "wget", "-qO", "/dev/null", "http://localhost:8983/solr/"] redis: - container_name: ${REDIS_CONTAINER_NAME} image: redis:${REDIS_VERSION} networks: - redisnet