From c18f4e9fcd3f1d94d4429b404b7d43cafc6c285a Mon Sep 17 00:00:00 2001 From: Lei Chu <1062186165@qq.com> Date: Fri, 23 Jul 2021 09:55:56 +0800 Subject: [PATCH 1/6] wasmsdk image support bazel Signed-off-by: Lei Chu <1062186165@qq.com> --- Dockerfile-sdk | 2 ++ sdk_container.sh | 11 +++++++++++ 2 files changed, 13 insertions(+) diff --git a/Dockerfile-sdk b/Dockerfile-sdk index 3dc28c1..6becb4c 100644 --- a/Dockerfile-sdk +++ b/Dockerfile-sdk @@ -5,3 +5,5 @@ COPY ./build_wasm.sh / COPY *.cc *.h *.js *.proto Makefile* *.a /sdk/ RUN ./sdk_container.sh + +ENV PATH="${PATH}:/usr/local/go/bin:/root/go/bin" \ No newline at end of file diff --git a/sdk_container.sh b/sdk_container.sh index daa5aff..cb383ff 100755 --- a/sdk_container.sh +++ b/sdk_container.sh @@ -31,6 +31,17 @@ export CC=gcc-7 export CXX=g++-7 export CPP=cpp-7 +# goland + +wget https://golang.org/dl/go1.16.6.linux-amd64.tar.gz +rm -rf /usr/local/go && tar -C /usr/local -xzf go1.16.6.linux-amd64.tar.gz +rm -rf go1.16.6.linux-amd64.tar.gz +export PATH=$PATH:/usr/local/go/bin + +# bazel +go get github.com/bazelbuild/bazelisk +ln -s /root/go/bin/bazelisk /root/go/bin/bazel + # get $HOME cd From 6deaaeb2b5937a17a6ba4c9503d535f1b6ea75c0 Mon Sep 17 00:00:00 2001 From: Lei Chu <1062186165@qq.com> Date: Fri, 23 Jul 2021 15:17:27 +0800 Subject: [PATCH 2/6] wasmsdk image support bazel Signed-off-by: Lei Chu <1062186165@qq.com> --- , | 0 sdk_container.sh | 7 +++++-- 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 , diff --git a/, b/, new file mode 100644 index 0000000..e69de29 diff --git a/sdk_container.sh b/sdk_container.sh index cb383ff..3c1b036 100755 --- a/sdk_container.sh +++ b/sdk_container.sh @@ -39,8 +39,11 @@ rm -rf go1.16.6.linux-amd64.tar.gz export PATH=$PATH:/usr/local/go/bin # bazel -go get github.com/bazelbuild/bazelisk -ln -s /root/go/bin/bazelisk /root/go/bin/bazel +wget https://github.com/bazelbuild/bazelisk/releases/download/v1.10.1/bazelisk-linux-amd64 +chmod +x bazelisk-linux-amd64 +mv bazelisk-linux-amd64 /usr/local/bin/bazelisk + +ln -s /usr/local/bin/bazelisk /usr/local/bin/bazel # get $HOME cd From bde0057bd28b9d99246e3f128a4d169c683a17e1 Mon Sep 17 00:00:00 2001 From: Lei Chu <1062186165@qq.com> Date: Sat, 24 Jul 2021 00:38:57 +0800 Subject: [PATCH 3/6] wasmsdk image support bazel Signed-off-by: Lei Chu <1062186165@qq.com> --- , | 0 Dockerfile-sdk | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 , diff --git a/, b/, deleted file mode 100644 index e69de29..0000000 diff --git a/Dockerfile-sdk b/Dockerfile-sdk index 6becb4c..d5bfcb4 100644 --- a/Dockerfile-sdk +++ b/Dockerfile-sdk @@ -6,4 +6,5 @@ COPY *.cc *.h *.js *.proto Makefile* *.a /sdk/ RUN ./sdk_container.sh -ENV PATH="${PATH}:/usr/local/go/bin:/root/go/bin" \ No newline at end of file +ENV PATH="${PATH}:/usr/local/go/bin:/root/go/bin" \ + TEST_TMPDIR=/tmp \ No newline at end of file From 2e1a2399134eb38c7d5aaeff9685963c34912e52 Mon Sep 17 00:00:00 2001 From: Lei Chu <1062186165@qq.com> Date: Sat, 24 Jul 2021 00:40:01 +0800 Subject: [PATCH 4/6] delete env TEST_TMPDIR Signed-off-by: Lei Chu <1062186165@qq.com> --- Dockerfile-sdk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile-sdk b/Dockerfile-sdk index d5bfcb4..6becb4c 100644 --- a/Dockerfile-sdk +++ b/Dockerfile-sdk @@ -6,5 +6,4 @@ COPY *.cc *.h *.js *.proto Makefile* *.a /sdk/ RUN ./sdk_container.sh -ENV PATH="${PATH}:/usr/local/go/bin:/root/go/bin" \ - TEST_TMPDIR=/tmp \ No newline at end of file +ENV PATH="${PATH}:/usr/local/go/bin:/root/go/bin" \ No newline at end of file From 9fda28b258bb6947690398cee72ec3fc803f9762 Mon Sep 17 00:00:00 2001 From: Lei Chu <1062186165@qq.com> Date: Sat, 24 Jul 2021 07:53:39 +0800 Subject: [PATCH 5/6] delete golang Signed-off-by: Lei Chu <1062186165@qq.com> --- Dockerfile-sdk | 2 -- sdk_container.sh | 7 ------- 2 files changed, 9 deletions(-) diff --git a/Dockerfile-sdk b/Dockerfile-sdk index 6becb4c..3dc28c1 100644 --- a/Dockerfile-sdk +++ b/Dockerfile-sdk @@ -5,5 +5,3 @@ COPY ./build_wasm.sh / COPY *.cc *.h *.js *.proto Makefile* *.a /sdk/ RUN ./sdk_container.sh - -ENV PATH="${PATH}:/usr/local/go/bin:/root/go/bin" \ No newline at end of file diff --git a/sdk_container.sh b/sdk_container.sh index 3c1b036..6a2cefe 100755 --- a/sdk_container.sh +++ b/sdk_container.sh @@ -31,13 +31,6 @@ export CC=gcc-7 export CXX=g++-7 export CPP=cpp-7 -# goland - -wget https://golang.org/dl/go1.16.6.linux-amd64.tar.gz -rm -rf /usr/local/go && tar -C /usr/local -xzf go1.16.6.linux-amd64.tar.gz -rm -rf go1.16.6.linux-amd64.tar.gz -export PATH=$PATH:/usr/local/go/bin - # bazel wget https://github.com/bazelbuild/bazelisk/releases/download/v1.10.1/bazelisk-linux-amd64 chmod +x bazelisk-linux-amd64 From f0f4c072932d67f0f0d62fe2bd5c72900f6bfea9 Mon Sep 17 00:00:00 2001 From: Lei Chu <1062186165@qq.com> Date: Sat, 24 Jul 2021 07:58:23 +0800 Subject: [PATCH 6/6] remove ln Signed-off-by: Lei Chu <1062186165@qq.com> --- sdk_container.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sdk_container.sh b/sdk_container.sh index 6a2cefe..76acf4a 100755 --- a/sdk_container.sh +++ b/sdk_container.sh @@ -34,9 +34,7 @@ export CPP=cpp-7 # bazel wget https://github.com/bazelbuild/bazelisk/releases/download/v1.10.1/bazelisk-linux-amd64 chmod +x bazelisk-linux-amd64 -mv bazelisk-linux-amd64 /usr/local/bin/bazelisk - -ln -s /usr/local/bin/bazelisk /usr/local/bin/bazel +mv bazelisk-linux-amd64 /usr/local/bin/bazel # get $HOME cd