Merge remote-tracking branch 'origin/feature' into feature

Author: devSonami

compose-sample-2/docker-compose.yml

@@ -4,7 +4,7 @@ services:
   proxy:
     image: nginx:1.13 # this will use the latest version of 1.13.x
     ports:
-      - '80:80' # expose 80 on host and sent to 80 in container
+      - '81:80' # expose 80 on host and sent to 80 in container
     volumes:
       - ./nginx.conf:/etc/nginx/conf.d/default.conf:ro
   web: