diff --git a/demos/flink/flink.yaml b/demos/flink/flink.yaml new file mode 100644 index 00000000..5dc6c9b1 --- /dev/null +++ b/demos/flink/flink.yaml @@ -0,0 +1,23 @@ +includes: + - base.yaml + - java-11-openjdk-amd64.yaml +targets: + # copy flink directory + - target: /bin + copy: + - from: ../flink-1.10.1 + # copy hosts file + - target: /etc + copy: + - files: + - ../hosts + # copy localtime + - target: /etc + copy: + - files: + - /etc/localtime + # copy libnss_files + - target: /opt/occlum/glibc/lib + copy: + - files: + - /opt/occlum/glibc/lib/libnss_files.so.2 diff --git a/demos/flink/run_flink_on_occlum_glibc.sh b/demos/flink/run_flink_on_occlum_glibc.sh index c4e73c49..43ced5ab 100755 --- a/demos/flink/run_flink_on_occlum_glibc.sh +++ b/demos/flink/run_flink_on_occlum_glibc.sh @@ -28,15 +28,8 @@ init_instance() { build_flink() { # Copy JVM and class file into Occlum instance and build - mkdir -p image/usr/lib/jvm - cp -r /usr/lib/jvm/java-11-openjdk-amd64 image/usr/lib/jvm - cp /lib/x86_64-linux-gnu/libz.so.1 image/lib - cp $occlum_glibc/libdl.so.2 image/$occlum_glibc - cp $occlum_glibc/librt.so.1 image/$occlum_glibc - cp $occlum_glibc/libm.so.6 image/$occlum_glibc - cp $occlum_glibc/libnss_files.so.2 image/$occlum_glibc - cp -rf ../flink-1.10.1/* image/bin/ - cp -rf ../hosts image/etc/ + rm -rf image + copy_bom -f ../flink.yaml --root image --include-dir /opt/occlum/etc/template occlum build } diff --git a/etc/template/java-11-openjdk-amd64.yaml b/etc/template/java-11-openjdk-amd64.yaml new file mode 100644 index 00000000..5c2c85dd --- /dev/null +++ b/etc/template/java-11-openjdk-amd64.yaml @@ -0,0 +1,21 @@ +# glibc backend openjdk +targets: + # copy jvm + - target: /usr/lib/jvm + copy: + - dirs: + - /usr/lib/jvm/java-11-openjdk-amd64 + - target: /etc + 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 b7ce7df6..d5d28945 100644 --- a/etc/template/java-11-openjdk.yaml +++ b/etc/template/java-11-openjdk.yaml @@ -1,3 +1,4 @@ +# musl backend openjdk targets: # copy jvm - target: /usr/lib/jvm diff --git a/tools/copy_bom/.gitignore b/tools/copy_bom/.gitignore index 257f0ab2..7bed9a5f 100644 --- a/tools/copy_bom/.gitignore +++ b/tools/copy_bom/.gitignore @@ -9,3 +9,4 @@ base.yaml occlum_elf_loader.config java-11-alibaba-dragonwell.yaml java-11-openjdk.yaml +java-11-openjdk-amd64.yaml