From bc3a5a57c3f3616a3073dfec405e2f52b2229093 Mon Sep 17 00:00:00 2001 From: bdh92123 Date: Sat, 19 Nov 2016 16:44:43 +0900 Subject: [PATCH 1/9] Delete run.sh --- run.sh | 1 - 1 file changed, 1 deletion(-) delete mode 100644 run.sh diff --git a/run.sh b/run.sh deleted file mode 100644 index 1474fd4..0000000 --- a/run.sh +++ /dev/null @@ -1 +0,0 @@ -arg=();for var in "$@";do arg+=($(echo -n "$var" | base64 -d)); done; node /root/JavascriptTester.js "${arg[@]}" From 5cf28bb5bcb1c4d227472f985e5315a6aafb4e60 Mon Sep 17 00:00:00 2001 From: bdh92123 Date: Sat, 19 Nov 2016 16:53:06 +0900 Subject: [PATCH 2/9] Add source file. --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f778bf4..c94692f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,9 @@ FROM regexpress/base:latest COPY CppTester.cpp /root - +COPY CppTester.h /root COPY CppTesterTest.cpp /root +COPY json.hpp /root RUN apk update && \ apk add --no-cache --virtual .build-deps g++=5.3.0-r0 && \ From f3c3b78e3bc8e1318f7249901289a5faeb64aad5 Mon Sep 17 00:00:00 2001 From: bdh92123 Date: Sat, 19 Nov 2016 17:18:35 +0900 Subject: [PATCH 3/9] Fix mIstype --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c94692f..23bbf38 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN apk update && \ g++ -std=c++11 CppTesterTest.cpp -o CppTesterTest && \ echo "arg=();for var in \"\$@\";do arg+=(\$(echo -n \"\$var\" | base64 -d)); done; ./CppTester \"\${arg[@]}\"" > run.sh && \ chmod 755 run.sh && \ - apk del .build-deps + apk del .build-deps && \ rm -rf /tmp/* ENTRYPOINT ["/bin/bash", "/root/run.sh"] \ No newline at end of file From 7c7b16bffa38e6cc5e0e804c2a7e95437182701f Mon Sep 17 00:00:00 2001 From: bdh92123 Date: Sun, 20 Nov 2016 19:07:39 +0900 Subject: [PATCH 4/9] Fix parameter bug. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 23bbf38..054c19d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ RUN apk update && \ cd /root && \ g++ -std=c++11 CppTester.cpp -o CppTester && \ g++ -std=c++11 CppTesterTest.cpp -o CppTesterTest && \ - echo "arg=();for var in \"\$@\";do arg+=(\$(echo -n \"\$var\" | base64 -d)); done; ./CppTester \"\${arg[@]}\"" > run.sh && \ + echo "arg=();for var in \"\$@\";do arg+=(\"\$(echo -n \"\$var\" | base64 -d)\"); done; ./CppTester \"\${arg[@]}\"" > run.sh && \ chmod 755 run.sh && \ apk del .build-deps && \ rm -rf /tmp/* From f0eb4d78f43c366c4040563694fbd8d340edaaac Mon Sep 17 00:00:00 2001 From: bdh92123 Date: Sun, 20 Nov 2016 23:40:10 +0900 Subject: [PATCH 5/9] Fix path. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 054c19d..db8395c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ RUN apk update && \ cd /root && \ g++ -std=c++11 CppTester.cpp -o CppTester && \ g++ -std=c++11 CppTesterTest.cpp -o CppTesterTest && \ - echo "arg=();for var in \"\$@\";do arg+=(\"\$(echo -n \"\$var\" | base64 -d)\"); done; ./CppTester \"\${arg[@]}\"" > run.sh && \ + echo "arg=();for var in \"\$@\";do arg+=(\"\$(echo -n \"\$var\" | base64 -d)\"); done; /root/CppTester \"\${arg[@]}\"" > run.sh && \ chmod 755 run.sh && \ apk del .build-deps && \ rm -rf /tmp/* From 0b54309656805878801ca53f82c2c5e33476f52d Mon Sep 17 00:00:00 2001 From: bdh92123 Date: Mon, 21 Nov 2016 01:26:14 +0900 Subject: [PATCH 6/9] Add package. --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index db8395c..0157fed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,7 @@ RUN apk update && \ echo "arg=();for var in \"\$@\";do arg+=(\"\$(echo -n \"\$var\" | base64 -d)\"); done; /root/CppTester \"\${arg[@]}\"" > run.sh && \ chmod 755 run.sh && \ apk del .build-deps && \ + apk add --no-cache libstdc++ && \ rm -rf /tmp/* ENTRYPOINT ["/bin/bash", "/root/run.sh"] \ No newline at end of file From 09a332700b0cf6f6063e98e8164990899920a336 Mon Sep 17 00:00:00 2001 From: bdh92123 Date: Mon, 21 Nov 2016 16:32:36 +0900 Subject: [PATCH 7/9] Fix column. --- CppTester.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CppTester.h b/CppTester.h index dfef84e..735a660 100644 --- a/CppTester.h +++ b/CppTester.h @@ -75,7 +75,6 @@ class CppTester { } else if(subtype == "extract") { result["type"] = "GROUP"; result["result"]["columns"] = json(); - } smatch match; bool first = true; @@ -109,6 +108,7 @@ class CppTester { } } else if(test_type == "search") { result["type"] = "GROUP"; + result["result"]["columns"] = json(); smatch match; bool first = true; From e120b82c35da60a25b90fbcd4976146830f5b30f Mon Sep 17 00:00:00 2001 From: bdh92123 Date: Mon, 21 Nov 2016 17:11:51 +0900 Subject: [PATCH 8/9] Fix null columns --- CppTester.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CppTester.h b/CppTester.h index 735a660..2c2ba56 100644 --- a/CppTester.h +++ b/CppTester.h @@ -114,7 +114,7 @@ class CppTester { for(string test_string: test_strings) { json groups_list; - groups_list["list"] = json(); + groups_list["list"] = json::array(); string temp_string = test_string; while(regex_search(temp_string, match, pattern, (match_flag_type) match_flags)) { From c3bc0584b9133e918c91c62e46eca0994d771703 Mon Sep 17 00:00:00 2001 From: bdh92123 Date: Mon, 21 Nov 2016 17:30:05 +0900 Subject: [PATCH 9/9] Fix null column --- CppTester.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CppTester.h b/CppTester.h index 2c2ba56..f5c1c87 100644 --- a/CppTester.h +++ b/CppTester.h @@ -108,7 +108,7 @@ class CppTester { } } else if(test_type == "search") { result["type"] = "GROUP"; - result["result"]["columns"] = json(); + result["result"]["columns"] = json::array(); smatch match; bool first = true;