Merge branch 'rolling' into improve-comments-in-dockerfile-and-compose-file

docker-compose.yml

@@ -17,4 +17,4 @@ services:
   # redis:
   #   image: redis:latest
   #   ports:
-  #     - 6379:6379
+  #     - 6379:6379