From 5a652239f6fac9f04fe952283e6e9ca2221d64dd Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@bitnami.com>
Date: Fri, 4 Nov 2016 20:39:47 +0530
Subject: [PATCH 1/2] adds docker-compose.yml

---
 bitnami/memcached/docker-compose.yml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 bitnami/memcached/docker-compose.yml

diff --git a/bitnami/memcached/docker-compose.yml b/bitnami/memcached/docker-compose.yml
new file mode 100644
index 000000000000..194869649230
--- /dev/null
+++ b/bitnami/memcached/docker-compose.yml
@@ -0,0 +1,7 @@
+version: '2'
+
+services:
+  memcached:
+    image: 'bitnami/memcached:latest'
+    ports:
+      - '11211:11211'

From 24fd6813ad830b18eaf7ea802374ddc4c885ea59 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@bitnami.com>
Date: Tue, 8 Nov 2016 15:19:44 +0530
Subject: [PATCH 2/2] readme: updated docker-compose.yml snippets to v2 format

---
 bitnami/memcached/README.md | 38 ++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/bitnami/memcached/README.md b/bitnami/memcached/README.md
index d6f3d784c963..2f9f274a2a16 100644
--- a/bitnami/memcached/README.md
+++ b/bitnami/memcached/README.md
@@ -16,8 +16,13 @@ docker run --name memcached bitnami/memcached:latest
 ## Docker Compose
 
 ```yaml
-memcached:
-  image: bitnami/memcached:latest
+version: '2'
+
+services:
+  memcached:
+    image: 'bitnami/memcached:latest'
+    ports:
+      - '11211:11211'
 ```
 
 # Get this image
@@ -74,8 +79,9 @@ Inside `myapp`, use `memcached` as the hostname for the Memcached server.
 Copy the snippet below into your `docker-compose.yml` to add Memcached to your application.
 
 ```yaml
-memcached:
-  image: bitnami/memcached
+services:
+  memcached:
+    image: 'bitnami/memcached:latest'
 ```
 
 ### Step 2: Link it to another container in your application
@@ -83,10 +89,11 @@ memcached:
 Update the definitions for containers you want to access your Memcached server from to include a link to the `memcached` entry you added in Step 1.
 
 ```yaml
-myapp:
-  image: myapp
-  links:
-    - memcached:memcached
+services:
+  myapp:
+    image: myapp
+    depends_on:
+      - memcached
 ```
 
 # Configuration
@@ -105,11 +112,16 @@ docker run --name memcached \
 or using Docker Compose:
 
 ```yaml
-memcached:
-  image: bitnami/memcached:latest
-  environment:
-    - MEMCACHED_USERNAME=my_user
-    - MEMCACHED_PASSWORD=my_password
+version: '2'
+
+services:
+  memcached:
+    image: 'bitnami/memcached:latest'
+    ports:
+      - '11211:11211'
+    environment:
+      - MEMCACHED_USERNAME=my_user
+      - MEMCACHED_PASSWORD=my_password
 ```
 
 > The default value of the `MEMCACHED_USERNAME` is `root`.