From ff82eae098a1ee416399fc09d1db1696123aae78 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sun, 26 Sep 2021 01:13:22 +0200 Subject: [PATCH] Execute script separately --- Dockerfile | 7 +------ .../continuous-integration/docker/build-natives.sh | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 scripts/continuous-integration/docker/build-natives.sh diff --git a/Dockerfile b/Dockerfile index 8ea8c4f..fd71c46 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,12 +27,7 @@ ADD src /usr/src/tdlight-java-natives/src WORKDIR /usr/src/tdlight-java-natives/ -RUN /bin/bash -c "export JAVA_HOME=\"/usr/lib/jvm/$(ls /usr/lib/jvm/ | grep openjdk | head -n 1)/\"; \ - export JAVA_INCLUDE_PATH=\"$JAVA_HOME/include\"; \ - source ./scripts/continuous-integration/github-workflows/setup-variables.sh; \ - sudo apt install -y crossbuild-essential-${CPU_ARCH_DPKG}; \ - source ./scripts/continuous-integration/github-workflows/install-dependencies.sh; \ - source ./scripts/continuous-integration/github-workflows/build-natives.sh" +RUN /bin/bash /usr/src/tdlight-java-natives/scripts/continuous-integration/docker/build-natives.sh #WORKDIR /usr/src/tdlight-java-natives/generated/ #RUN echo "aaaa" > test.txt diff --git a/scripts/continuous-integration/docker/build-natives.sh b/scripts/continuous-integration/docker/build-natives.sh new file mode 100644 index 0000000..0c51ae0 --- /dev/null +++ b/scripts/continuous-integration/docker/build-natives.sh @@ -0,0 +1,14 @@ +#!/bin/bash -e +echo "\$PWD=${PWD}" +export JAVA_HOME +JAVA_HOME="/usr/lib/jvm/$(find "/usr/lib/jvm/" -maxdepth 1 -type d -iname "java*jdk*" | head -n 1)/" +export JAVA_INCLUDE_PATH="$JAVA_HOME/include" +source ./scripts/continuous-integration/github-workflows/setup-variables.sh +# Check variables correctness +if [ -z "${CPU_ARCH_DPKG}" ]; then + echo "Missing parameter: CPU_ARCH_DPKG" + exit 1 +fi +sudo apt install -y "crossbuild-essential-${CPU_ARCH_DPKG}" +source ./scripts/continuous-integration/github-workflows/install-dependencies.sh +source ./scripts/continuous-integration/github-workflows/build-natives.sh