diff --git a/jenkins/docker/dockerfile b/jenkins/docker/dockerfile index 9caf4cb..5b975a2 100644 --- a/jenkins/docker/dockerfile +++ b/jenkins/docker/dockerfile @@ -32,7 +32,17 @@ RUN mkdir /output WORKDIR /work -RUN export JAVA_HOME=/usr/lib/jvm/zulu15 +ENV JAVA_HOME=/usr/lib/jvm/zulu15 + +ENV JAVA_INCLUDE_PATH=/usr/lib/jvm/zulu15/include + +ENV TRAVIS_CPU_ARCH=amd64 + +ENV TRAVIS_OS_NAME=linux + +ENV TRAVIS_BUILD_DIR=/work/tdlight-java + +ENV TRAVIS_OUTPUT_DIR=/output #RUN ./build.sh diff --git a/jenkins/scripts/setup_variables.sh b/jenkins/scripts/setup_variables.sh index ec23647..6265346 100755 --- a/jenkins/scripts/setup_variables.sh +++ b/jenkins/scripts/setup_variables.sh @@ -1,12 +1,6 @@ #!/bin/bash -e set -e -# ====== Static variables -export TRAVIS_CPU_ARCH="amd64" -export TRAVIS_OS_NAME="linux" -export TRAVIS_BUILD_DIR="/work/tdlight-java" -export OUTPUT_DIR="/output" - # ====== Variables export TD_SRC_DIR=$TRAVIS_BUILD_DIR/dependencies/tdlight export TD_BIN_DIR=$TRAVIS_BUILD_DIR/bin-td @@ -63,7 +57,7 @@ elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then #export JAVA_HOME="/usr/lib/jvm/java-11-openjdk-$TRAVIS_CPU_ARCH_JAVA" #export JAVA_INCLUDE_PATH="/usr/lib/jvm/java-11-openjdk-$TRAVIS_CPU_ARCH_JAVA/include" fi -export TDLIB_RESOURCES_OUTPUT_DIR="$OUTPUT_DIR/resources/libs/$TRAVIS_OS_NAME_SHORT/$TRAVIS_CPU_ARCH_STANDARD" +export TDLIB_RESOURCES_OUTPUT_DIR="$TRAVIS_OUTPUT_DIR/resources/libs/$TRAVIS_OS_NAME_SHORT/$TRAVIS_CPU_ARCH_STANDARD" # ====== Print variables echo "TD_SRC_DIR=${TD_SRC_DIR}"