From b65895c223ab6970c903213fe93e6fc60caadf65 Mon Sep 17 00:00:00 2001 From: MicroEJ GitHub Delivery Date: Thu, 19 Oct 2023 12:39:02 +0000 Subject: [PATCH] Version 1.7.2 --- 5.8.1-jdk11/Dockerfile | 4 ++-- 5.8.1-jdk11/run.sh | 7 +++---- 5.8.1/Dockerfile | 4 ++-- 5.8.1/run.sh | 7 +++---- README.md | 18 +++++++++++++----- 5 files changed, 23 insertions(+), 17 deletions(-) diff --git a/5.8.1-jdk11/Dockerfile b/5.8.1-jdk11/Dockerfile index c2d7b14..526903b 100644 --- a/5.8.1-jdk11/Dockerfile +++ b/5.8.1-jdk11/Dockerfile @@ -45,8 +45,8 @@ ENV PATH=$BUILD_KIT_HOME/bin:$PATH WORKDIR ${HOME} # I) Install SDK -ARG SDK_DISTRIBUTION_BASE_URL="" -ARG SDK_DISTRIBUTION_TOKEN="" +ARG SDK_DISTRIBUTION_BASE_URL +ARG SDK_DISTRIBUTION_TOKEN RUN curl -f -H "X-JFrog-Art-Api:${SDK_DISTRIBUTION_TOKEN}" -O ${SDK_DISTRIBUTION_BASE_URL}/23.07/microej-sdk-23.07-linux_x86_64.zip && \ mkdir -p $ECLIPSE_HOME && \ unzip microej-sdk-23.07-linux_x86_64.zip -d $ECLIPSE_HOME && \ diff --git a/5.8.1-jdk11/run.sh b/5.8.1-jdk11/run.sh index 1004bc2..8eb2900 100644 --- a/5.8.1-jdk11/run.sh +++ b/5.8.1-jdk11/run.sh @@ -2,20 +2,19 @@ # # Copyright 2023 MicroEJ Corp. All rights reserved. -# This library is provided in source code for use, modification and test, subject to license terms. -# Any modification of the source code will break MicroEJ Corp. warranties on the whole library. +# Use of this source code is governed by a BSD-style license that can be found with this software. # set -e -if [ "$ACCEPT_MICROEJ_SDK_EULA" != "yes" ] && [ "$ACCEPT_MICROEJ_SDK_EULA" != "YES" ] +if [ "$ACCEPT_MICROEJ_SDK_EULA_V3_1B" != "yes" ] && [ "$ACCEPT_MICROEJ_SDK_EULA_V3_1B" != "YES" ] then echo "" echo "##############################################################" echo "##### The MICROEJ SDK End-User License Agreement (EULA) must be accepted before it can start." echo "##### The license terms for this product can be downloaded from " echo "##### https://repository.microej.com/licenses/sdk/LAW-0011-LCS-MicroEJ_SDK-EULA-v3.1B.txt" - echo "##### You can accept the EULA by setting the ACCEPT_MICROEJ_SDK_EULA=YES environment variable" + echo "##### You can accept the EULA by setting the ACCEPT_MICROEJ_SDK_EULA_V3_1B=YES environment variable" echo "##############################################################" echo "" exit -1 diff --git a/5.8.1/Dockerfile b/5.8.1/Dockerfile index 28d2cdb..705b805 100644 --- a/5.8.1/Dockerfile +++ b/5.8.1/Dockerfile @@ -45,8 +45,8 @@ ENV PATH=$BUILD_KIT_HOME/bin:$PATH WORKDIR ${HOME} ## I) Install SDK -ARG SDK_DISTRIBUTION_BASE_URL="" -ARG SDK_DISTRIBUTION_TOKEN="" +ARG SDK_DISTRIBUTION_BASE_URL +ARG SDK_DISTRIBUTION_TOKEN RUN curl -f -H "X-JFrog-Art-Api:${SDK_DISTRIBUTION_TOKEN}" -O ${SDK_DISTRIBUTION_BASE_URL}/21.11/microej-sdk-21.11-linux_x86_64.zip && \ mkdir -p $ECLIPSE_HOME && \ unzip microej-sdk-21.11-linux_x86_64.zip -d $ECLIPSE_HOME && \ diff --git a/5.8.1/run.sh b/5.8.1/run.sh index 1004bc2..8eb2900 100644 --- a/5.8.1/run.sh +++ b/5.8.1/run.sh @@ -2,20 +2,19 @@ # # Copyright 2023 MicroEJ Corp. All rights reserved. -# This library is provided in source code for use, modification and test, subject to license terms. -# Any modification of the source code will break MicroEJ Corp. warranties on the whole library. +# Use of this source code is governed by a BSD-style license that can be found with this software. # set -e -if [ "$ACCEPT_MICROEJ_SDK_EULA" != "yes" ] && [ "$ACCEPT_MICROEJ_SDK_EULA" != "YES" ] +if [ "$ACCEPT_MICROEJ_SDK_EULA_V3_1B" != "yes" ] && [ "$ACCEPT_MICROEJ_SDK_EULA_V3_1B" != "YES" ] then echo "" echo "##############################################################" echo "##### The MICROEJ SDK End-User License Agreement (EULA) must be accepted before it can start." echo "##### The license terms for this product can be downloaded from " echo "##### https://repository.microej.com/licenses/sdk/LAW-0011-LCS-MicroEJ_SDK-EULA-v3.1B.txt" - echo "##### You can accept the EULA by setting the ACCEPT_MICROEJ_SDK_EULA=YES environment variable" + echo "##### You can accept the EULA by setting the ACCEPT_MICROEJ_SDK_EULA_V3_1B=YES environment variable" echo "##############################################################" echo "" exit -1 diff --git a/README.md b/README.md index b303765..0906394 100644 --- a/README.md +++ b/README.md @@ -22,22 +22,30 @@ You can also build them yourself following build instruction bellow and our [Git For MicroEJ SDK version `5.4.1` and above, please refer to . +The use of the SDK Docker images requires to approve the End-User License Agreement. +You can accept the EULA by setting the **ACCEPT_MICROEJ_SDK_EULA_XXX** environment variable to **YES**, +whereis **XXX** is the version of the EULA version, for example `ACCEPT_MICROEJ_SDK_EULA_V3_1B=YES`. + Start the image for interactive usage: ``` console -$ docker run --rm -it microej/sdk:5.4.1 bash +$ docker run --rm -it -e ACCEPT_MICROEJ_SDK_EULA_V3_1B=YES microej/sdk:5.8.1 bash ``` Build a project from a local folder: ``` console -$ docker run --rm -v PATH/TO/PROJECT:/project -w /project microej/sdk:5.4.1 mmm build +$ docker run --rm -v PATH/TO/PROJECT:/project -w /project -e ACCEPT_MICROEJ_SDK_EULA_V3_1B=YES microej/sdk:5.8.1 mmm build ``` -You can also build the image yourself from `Dockerfile`: +You can also build the image yourself from the `Dockerfile`. +This requires to: +- [retrieve the Portable version of the SDK](https://docs.microej.com/en/latest/SDKUserGuide/installSDKDistributionPortable.html) +- upload it to an accessible remote location in a folder named after the SDK version. For example if your base URL is `https://my.server/microej-sdk` and the SDK version is 23.07, the SDK Distribution should be uploaded at `https://my.server/microej-sdk/23.07/microej-sdk-23.07-linux_x86_64.zip`. +- launch the build of the image with the `SDK_DISTRIBUTION_BASE_URL` argument: ``` console -$ docker build -t microej/sdk:5.4.1 5.4.1 +$ docker build --build-arg="SDK_DISTRIBUTION_BASE_URL=https://my.server/microej-sdk" -t microej/sdk:5.8.1 5.8.1 ``` ### MicroEJ SDK version `4.1.5` to `5.3.1` @@ -112,5 +120,5 @@ for more information. --- _Markdown_ -_Copyright 2021-2022 MicroEJ Corp. All rights reserved._ +_Copyright 2021-2023 MicroEJ Corp. All rights reserved._ _Use of this source code is governed by a BSD-style license that can be found with this software._ \ No newline at end of file