[plc4x] branch develop updated: - Fixed the Dockerfile - Reset the python version back to 2.7 as 3.6 wasn't really needed

[cd...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git


The following commit(s) were added to refs/heads/develop by this push:
     new a6fc689  - Fixed the Dockerfile - Reset the python version back to 2.7 as 3.6 wasn't really needed
a6fc689 is described below

commit a6fc6891afc72a5670a179def01031981be3aab0
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Fri Sep 10 06:34:36 2021 -0700

    - Fixed the Dockerfile
    - Reset the python version back to 2.7 as 3.6 wasn't really needed
---
 Dockerfile                               | 25 +++++++++----------------
 src/main/script/prerequisiteCheck.groovy |  2 +-
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5e045da..f9a1d8f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,40 +26,33 @@ FROM azul/zulu-openjdk:11 as build
 RUN apt update -y
 
 # Install general purpose tools
-RUN apt install -y make libpcap-dev libc-dev
+RUN apt install -y make libpcap-dev libc-dev git
 
 # Requied for "with-boost" profile
-RUN apt install -y bison flex gcc g++
+#RUN apt install -y bison flex gcc g++
 
 # Required for "with-cpp" profile
-RUN apt install -y gcc g++
+#RUN apt install -y gcc g++
 
 # Required for "with-proxies" and "with-cpp"
-RUN apt install -y clang
+#RUN apt install -y clang
 
 # Required for "with-proxies" and "with-cpp"
-RUN apt install -y cmake
+#RUN apt install -y cmake
 
 # Required for "with-dotnet" profile
 RUN apt install -y wget
-RUN wget -q https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
+RUN wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
 RUN dpkg -i packages-microsoft-prod.deb
 RUN apt install -y software-properties-common
 RUN add-apt-repository universe -y
 RUN apt install -y apt-transport-https
 RUN apt update -y
-RUN apt install -y dotnet-sdk-2.2
+RUN apt install -y dotnet-sdk-3.1
 
 # Required for "with-go" profile
-RUN add-apt-repository ppa:ubuntu-lxc/stable
 RUN apt install -y golang
 
-# Required for the general build
-RUN apt install -y git
-
-# Required for "with-proxies"
-RUN apt install -y bison flex gcc g++
-
 # Required for "with-python" profile
 RUN apt install -y python-setuptools python
 
@@ -74,7 +67,7 @@ WORKDIR /ws
 
 # Make the maven wrapper script executalbe (needed when running on Windows)
 RUN chmod +x ./mvnw
-# Change the line endint to unix-style (needed when running on Windows)
+# Change the line ending to unix-style (needed when running on Windows)
 RUN dos2unix ./mvnw
 RUN dos2unix .mvn/wrapper/maven-wrapper.properties
 
@@ -96,7 +89,7 @@ RUN ./mvnw org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpressio
 ##########################################################################################
 
 # Move the file to a place we can reference it from without a version
-RUN PROJECT_VERSION=`cat project_version`; mv plc4j/examples/hello-storage-elasticsearch/target/plc4j-hello-storage-elasticsearch-$PROJECT_VERSION-uber-jar.jar plc4xdemo.jar
+RUN PROJECT_VERSION=`cat project_version`; mv plc4j/examples/hello-integration-iotdb/target/plc4j-hello-integration-iotdb-${PROJECT_VERSION}-uber-jar.jar plc4xdemo.jar
 
 # Build a highly optimized JRE
 FROM alpine:3.10 as packager
diff --git a/src/main/script/prerequisiteCheck.groovy b/src/main/script/prerequisiteCheck.groovy
index 3f44445..cba1138 100644
--- a/src/main/script/prerequisiteCheck.groovy
+++ b/src/main/script/prerequisiteCheck.groovy
@@ -298,7 +298,7 @@ def checkPython() {
         Matcher matcher = extractVersion(stdOut + stdErr)
         if (matcher.size() > 0) {
             def curVersion = matcher[0][1]
-            def result = checkVersionAtLeast(curVersion, "3.6.0")
+            def result = checkVersionAtLeast(curVersion, "2.7.0")
             if (!result) {
                 allConditionsMet = false
             }