[iotdb-client-go] branch feature/gitsubmodule updated: move docker temp folder to target

[hx...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

hxd pushed a commit to branch feature/gitsubmodule
in repository https://gitbox.apache.org/repos/asf/iotdb-client-go.git


The following commit(s) were added to refs/heads/feature/gitsubmodule by this push:
     new f83490c  move docker temp folder to target
f83490c is described below

commit f83490cdb3d24d004b915bade4c07f740e2d43a4
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Wed Mar 10 13:25:53 2021 +0800

    move docker temp folder to target
---
 Makefile                         | 12 ++++++------
 test/e2e/Dockerfile.iotdb-server |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 8b985c9..2808b27 100644
--- a/Makefile
+++ b/Makefile
@@ -49,20 +49,20 @@ test:
 
 e2e_test:
 	sh -c "cd /tmp/ && rm -rf iotdb && git clone https://github.com/apache/iotdb.git && cd iotdb && mvn -Dmaven.test.skip=true package -am -pl server"
-	mkdir -p docker-context/iotdb
-	unzip -o -q /tmp/iotdb/server/target/iotdb-server-*.zip -d docker-context/iotdb
+	mkdir -p target/iotdb
+	unzip -o -q /tmp/iotdb/server/target/iotdb-server-*.zip -d target/iotdb
 	docker-compose -f test/e2e/docker-compose.yml up --build --abort-on-container-exit --remove-orphans
 
 e2e_test_clean:
-	rm -rf /tmp/iotdb docker-context
+	rm -rf /tmp/iotdb target
 	docker-compose -f test/e2e/docker-compose.yml down
 
 #only used for project structure that the iotdb main project is in the parent folder of this project.
 e2e_test_for_parent_git_repo:
-	mkdir -p docker-context/iotdb
-	unzip -o -q ../server/target/iotdb-server-*.zip -d docker-context/iotdb
+	mkdir -p target/iotdb
+	unzip -o -q ../server/target/iotdb-server-*.zip -d target/iotdb
 	docker-compose -f test/e2e/docker-compose.yml up --build --abort-on-container-exit --remove-orphans
 
 e2e_test_clean_for_parent_git_repo:
-	rm -rf docker-context
+	rm -rf target
 	docker-compose -f test/e2e/docker-compose.yml down
diff --git a/test/e2e/Dockerfile.iotdb-server b/test/e2e/Dockerfile.iotdb-server
index ed46745..4d6a8ab 100644
--- a/test/e2e/Dockerfile.iotdb-server
+++ b/test/e2e/Dockerfile.iotdb-server
@@ -21,7 +21,7 @@ FROM openjdk:11-jre-slim
 
 RUN apt update \
   && apt install -y procps && apt clean
-ADD docker-context /usr/local
+ADD target /usr/local
 WORKDIR /usr/local/iotdb
 EXPOSE 6667
 CMD [ "/usr/local/iotdb/sbin/start-server.sh" ]