Version 1.7.0

MicroEJ · Oct 18, 2023 · ee53b1b · ee53b1b
1 parent 268c388
commit ee53b1b
Show file tree

Hide file tree

Showing 6 changed files with 74 additions and 2 deletions.
diff --git a/5.8.1-jdk11/CHANGELOG.md b/5.8.1-jdk11/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.7.0] - 2023-10-18
+### Changed
+- Add EULA acceptation check when starting the container
+
 ## [1.6.0] - 2023-09-20
 ### Added
 - Add Dockerfile for sdk 5.8.1 and 5.8.0 jdk11

diff --git a/5.8.1-jdk11/Dockerfile b/5.8.1-jdk11/Dockerfile
@@ -45,7 +45,9 @@ ENV PATH=$BUILD_KIT_HOME/bin:$PATH
 WORKDIR ${HOME}
 
 # I) Install SDK
-RUN curl -O https://repository.microej.com/packages/SDK/23.07/zip/microej-sdk-23.07-linux_x86_64.zip && \
+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 && \
     rm -f microej-sdk-23.07-linux_x86_64.zip && \
@@ -91,5 +93,11 @@ RUN curl -O https://repository.microej.com/packages/SDK/23.07/zip/microej-sdk-23
     ln -s $HOME/.microej/build-repository-cache $BUILD_KIT_HOME/microej-build-repository/cache && \
     chown $user:$group $BUILD_KIT_HOME/microej-build-repository/cache
 
+
+ADD ./run.sh /run.sh
+RUN chmod a+x /run.sh
+
 # Good practice, switch back to user.
 USER ${user}
+
+ENTRYPOINT ["/run.sh"]
diff --git a/5.8.1-jdk11/run.sh b/5.8.1-jdk11/run.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+#
+# 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.
+#
+
+set -e
+
+if [ "$ACCEPT_MICROEJ_SDK_EULA" != "yes" ] && [ "$ACCEPT_MICROEJ_SDK_EULA" != "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 "##############################################################"
+    echo ""
+    exit -1
+fi
+
+exec "$@"
diff --git a/5.8.1/CHANGELOG.md b/5.8.1/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.7.0] - 2023-10-18
+### Changed
+- Add EULA acceptation check when starting the container
+
 ## [1.6.0] - 2023-09-20
 ### Added
 - Add Dockerfile for sdk 5.8.1 and 5.8.0 jdk11

diff --git a/5.8.1/Dockerfile b/5.8.1/Dockerfile
@@ -45,7 +45,9 @@ ENV PATH=$BUILD_KIT_HOME/bin:$PATH
 WORKDIR ${HOME}
 
 ## I) Install SDK
-RUN curl -O https://repository.microej.com/packages/SDK/21.11/zip/microej-sdk-21.11-linux_x86_64.zip && \
+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 && \
     rm -f microej-sdk-21.11-linux_x86_64.zip && \
@@ -92,5 +94,11 @@ RUN curl -O https://repository.microej.com/packages/SDK/21.11/zip/microej-sdk-21
     ln -s $HOME/.microej/build-repository-cache $BUILD_KIT_HOME/microej-build-repository/cache && \
     chown $user:$group $BUILD_KIT_HOME/microej-build-repository/cache
 
+
+ADD ./run.sh /run.sh
+RUN chmod a+x /run.sh
+
 # Good practice, switch back to user.
 USER ${user}
+
+ENTRYPOINT ["/run.sh"]
diff --git a/5.8.1/run.sh b/5.8.1/run.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+#
+# 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.
+#
+
+set -e
+
+if [ "$ACCEPT_MICROEJ_SDK_EULA" != "yes" ] && [ "$ACCEPT_MICROEJ_SDK_EULA" != "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 "##############################################################"
+    echo ""
+    exit -1
+fi
+
+exec "$@"