From f2229690ab33c85a028a2f16f55978da5d674776 Mon Sep 17 00:00:00 2001
From: Randy Fay <randy@randyfay.com>
Date: Fri, 25 Oct 2019 15:35:56 +0200
Subject: [PATCH] Make solr name lookup refer exclusively to the solr container
 in this project (#1897)

---
 .../testdata/services/docker-compose.beanstalkd.yaml           | 3 +++
 .../testdata/services/docker-compose.memcached.yaml            | 3 +++
 pkg/servicetest/testdata/services/docker-compose.solr.yaml     | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkg/servicetest/testdata/services/docker-compose.beanstalkd.yaml b/pkg/servicetest/testdata/services/docker-compose.beanstalkd.yaml
index 94d14b41b42..ac95c2b375f 100644
--- a/pkg/servicetest/testdata/services/docker-compose.beanstalkd.yaml
+++ b/pkg/servicetest/testdata/services/docker-compose.beanstalkd.yaml
@@ -16,4 +16,7 @@ services:
       com.ddev.site-name: ${DDEV_SITENAME}
     volumes:
     - ".:/mnt/ddev_config"
+  web:
+    links:
+    - beanstalk:beanstalk
 
diff --git a/pkg/servicetest/testdata/services/docker-compose.memcached.yaml b/pkg/servicetest/testdata/services/docker-compose.memcached.yaml
index 556174a96f5..d33c60f8676 100644
--- a/pkg/servicetest/testdata/services/docker-compose.memcached.yaml
+++ b/pkg/servicetest/testdata/services/docker-compose.memcached.yaml
@@ -31,3 +31,6 @@ services:
 
     volumes:
     - ".:/mnt/ddev_config"
+  web:
+    links:
+    - memcached:memcached
diff --git a/pkg/servicetest/testdata/services/docker-compose.solr.yaml b/pkg/servicetest/testdata/services/docker-compose.solr.yaml
index 5fc30d676c9..e3f36641306 100644
--- a/pkg/servicetest/testdata/services/docker-compose.solr.yaml
+++ b/pkg/servicetest/testdata/services/docker-compose.solr.yaml
@@ -65,7 +65,7 @@ services:
   # access the Solr service at sitename.ddev.site:8983.
   web:
     links:
-      - solr:$DDEV_HOSTNAME
+      - solr:solr
 volumes:
   # This creates a Docker volume that sticks around even if you remove or
   # rebuild the container