From 54bc08d09432380132fed643f9009dc17771c63d Mon Sep 17 00:00:00 2001 From: jianfengjiang Date: Thu, 23 Sep 2021 18:27:17 +0800 Subject: [PATCH] modify demos after implementing autodep for copydirs --- demos/flink/README.md | 12 ++++++++++++ demos/flink/README.txt | 10 ---------- demos/python/python_glibc/python-glibc.yaml | 5 ----- etc/template/java-11-alibaba-dragonwell.yaml | 5 ----- etc/template/java-11-openjdk-amd64.yaml | 10 ---------- etc/template/java-11-openjdk.yaml | 5 ----- 6 files changed, 12 insertions(+), 35 deletions(-) create mode 100644 demos/flink/README.md delete mode 100644 demos/flink/README.txt diff --git a/demos/flink/README.md b/demos/flink/README.md new file mode 100644 index 00000000..d5e375cf --- /dev/null +++ b/demos/flink/README.md @@ -0,0 +1,12 @@ +1. Run the flink jobmanager + ./run_flink_jobmanager_on_host.sh + +2. Run the taskManager + ./run_flink_on_occlum_glibc.sh tm + +3. Run flink jobs example + ./run_flink_on_occlum_glibc.sh task + +**Note:** +1. If running the jobmanager in docker, please export the port 8081 and 6123 +2. Step 2 may report warning for not finding shared objects. It doesn't matter. To avoid these warnings, you can **REPLACE the FIRST LINE** of config file `/opt/occlum/etc/template/occlum_elf_loader.config` with `/opt/occlum/glibc/lib/ld-linux-x86-64.so.2 /usr/lib/x86_64-linux-gnu:/lib/x86_64-linux-gnu:/usr/lib/jvm/java-11-openjdk-amd64/lib/server`. diff --git a/demos/flink/README.txt b/demos/flink/README.txt deleted file mode 100644 index ff594ac5..00000000 --- a/demos/flink/README.txt +++ /dev/null @@ -1,10 +0,0 @@ -1. Run the flink jobmanager - ./run_flink_jobmanager_on_host.sh - -2. Run the taskManager - ./run_flink_on_occlum_glibc.sh tm - -3. Run flink jobs example - ./run_flink_on_occlum_glibc.sh task - -Note: If running the jobmanager in docker, please export the port 8081 and 6123 diff --git a/demos/python/python_glibc/python-glibc.yaml b/demos/python/python_glibc/python-glibc.yaml index c88461b1..c3f4e68d 100644 --- a/demos/python/python_glibc/python-glibc.yaml +++ b/demos/python/python_glibc/python-glibc.yaml @@ -10,11 +10,6 @@ targets: copy: - dirs: - ../python-occlum - # explicit copy python3 to enable autodep for python3 - - target: /opt/python-occlum/bin - copy: - - files: - - ../python-occlum/bin/python3 # below are python code and data - target: / copy: diff --git a/etc/template/java-11-alibaba-dragonwell.yaml b/etc/template/java-11-alibaba-dragonwell.yaml index 2ec5ac09..e46be41a 100644 --- a/etc/template/java-11-alibaba-dragonwell.yaml +++ b/etc/template/java-11-alibaba-dragonwell.yaml @@ -4,8 +4,3 @@ targets: copy: - dirs: - /opt/occlum/toolchains/jvm/java-11-alibaba-dragonwell - # emplicit copy java to enable autodep for java - - target: /usr/lib/jvm/java-11-alibaba-dragonwell/bin - copy: - - files: - - /opt/occlum/toolchains/jvm/java-11-alibaba-dragonwell/bin/java \ No newline at end of file diff --git a/etc/template/java-11-openjdk-amd64.yaml b/etc/template/java-11-openjdk-amd64.yaml index 5c2c85dd..941f4673 100644 --- a/etc/template/java-11-openjdk-amd64.yaml +++ b/etc/template/java-11-openjdk-amd64.yaml @@ -9,13 +9,3 @@ targets: copy: - dirs: - /etc/java-11-openjdk - # explicit copy java to enable autodep for java - - target: /usr/lib/jvm/java-11-openjdk-amd64/bin - copy: - - files: - - /usr/lib/jvm/java-11-openjdk-amd64/bin/java - # explicit copy libjvm to enable autodep for this library - - target: /usr/lib/jvm/java-11-openjdk-amd64/lib/server - copy: - - files: - - /usr/lib/jvm/java-11-openjdk-amd64/lib/server/libjvm.so diff --git a/etc/template/java-11-openjdk.yaml b/etc/template/java-11-openjdk.yaml index d5d28945..77213501 100644 --- a/etc/template/java-11-openjdk.yaml +++ b/etc/template/java-11-openjdk.yaml @@ -5,8 +5,3 @@ targets: copy: - dirs: - /opt/occlum/toolchains/jvm/java-11-openjdk - # emplicit copy java to enable autodep for java - - target: /usr/lib/jvm/java-11-openjdk/bin - copy: - - files: - - /opt/occlum/toolchains/jvm/java-11-openjdk/bin/java \ No newline at end of file