docs: resolve conflicts

secretflow · Jul 6, 2023 · d502ae6 · d502ae6
2 parents 050f4ee + cc91807
commit d502ae6
Show file tree

Hide file tree

Showing 319 changed files with 36,405 additions and 18,785 deletions.
diff --git a/.ci/docker-compose/.env b/.ci/docker-compose/.env
@@ -1,3 +1,5 @@
-SCDB_PORT=8080
-MYSQL_PORT=13306
-SCQL_IMAGE_TAG=latest
+SCDB_PORTS=8080
+MYSQL_PORT=3317
+POSTGRES_PORT=7777
+SCQL_IMAGE_TAG=latest
+PROTOCOLS=SEMI2K
diff --git a/.ci/docker-compose/.gitignore b/.ci/docker-compose/.gitignore
@@ -0,0 +1,3 @@
+docker-compose.yaml
+docker-compose.yml
+scdb/conf/
diff --git a/.ci/docker-compose/README.md b/.ci/docker-compose/README.md
@@ -6,11 +6,10 @@
 docker compose up -d
 ```
 
-
 # Notes
 
-1. You could customize scdbserver and mysql container published port env `SCDB_PORT` and `MYSQL_PORT` in file `.env`, default port is `8080`.
+1. You could customize scdbserver and mysql container published port env `SCDB_PORT` and `MYSQL_PORT` in file `.env`.
 
 2. You could customize scql image tag via env `SCQL_IMAGE_TAG` in file `.env`.
 
-
+3. You could customize protocols via env `PROTOCOLS` in file `.env`.
diff --git a/.ci/docker-compose/csv/bob_tbl_0.csv b/.ci/docker-compose/csv/bob_tbl_0.csv
diff --git a/.ci/docker-compose/csv/bob_tbl_1.csv b/.ci/docker-compose/csv/bob_tbl_1.csv
diff --git a/.ci/docker-compose/csv/bob_tbl_2.csv b/.ci/docker-compose/csv/bob_tbl_2.csv