Merge branch 'master' of github.com:xmcy0011/CoffeeChat

xmcy0011 · xmcy0011 · commit b70a2b84d61a · 2022-06-22T11:32:41.000+08:00
# Conflicts:
#	server/docker-compose.yml
diff --git a/server/docker-compose.yml b/server/docker-compose.yml
@@ -26,6 +26,7 @@ services:
 #      ME_CONFIG_MONGODB_URL: mongodb://root:mongopass@mongo:27017/
   mysql:
     #image: 'arm64v8/mysql:8.0.28-oracle' # mac m1
+    image: 'mysql:5.7'
     restart: always
     container_name: cim_mysql
     environment:
