Release of version 2024.06.0 (#63)

* Gridlab-d is introducing breaking changes. Update gridlab-d branch to gridappsd-branch to maintain functionality. * Testing 3.10 * Update to python 3.10. No longer need 2 stage build * Update python 3.10 * Add gridappsd branch (#61) * Develop (#49) * Update Dockerfile.gridappsd_base Pin helics to v2.6.1 per Andy's request. * Update main.yml Fix tag parsing for github actions * helics 2.7.1 (#45) * Split build, add helics 2.7 back (#47) * Update main.yml * Update main.yml Docker tag parsing * Gridlab-d is introducing breaking changes. Update gridlab-d branch to gridappsd-branch to maintain functionality. (#51) * Gridlab-d is introducing breaking changes. Update gridlab-d branch to gridappsd-branch to maintain functionality. (#52) * Gridlab-d is introducing breaking changes. Update gridlab-d branch to gridappsd-branch to maintain functionality. (#53) * Gridlab-d is introducing breaking changes. Update gridlab-d branch to gridappsd-branch to maintain functionality. (#54) * Gridlab-d is introducing breaking changes. Update gridlab-d branch to gridappsd-branch to maintain functionality. (#55) * Gridlab-d is introducing breaking changes. Update gridlab-d branch to gridappsd-branch to maintain functionality. (#56) --------- Co-authored-by: Craig <[email protected]>
GRIDAPPSD · Jul 9, 2024 · 665e946 · 665e946
1 parent 101b8a4
commit 665e946
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 81 deletions.
diff --git a/Dockerfile.gridappsd_base b/Dockerfile.gridappsd_base
@@ -1,4 +1,48 @@
-FROM gridappsd/gridappsd_base:builder
+# This is a xenial base with python
+FROM python:3.10.9-slim-bullseye 
+
+RUN apt-get update \
+    && apt-get install -y \
+       wget \
+       git \
+       automake \
+       autoconf \
+       cmake \
+       make \
+       ca-certificates \
+       openssl \
+       # These two for activemq \       
+       libaprutil1-dev \
+       mariadb-client \
+       python3-dev \ 
+       python3-pip \
+       python3-setuptools \
+       sudo \
+       vim \
+       # state-estimator \
+       liblapack-dev \
+       libblas-dev \
+       #libssl1.0-dev \
+       libssl-dev \
+       # helics \
+       libboost-dev \
+       libzmq5-dev \
+       m4 \
+       procps \
+       libtool \
+    && rm -rf /var/lib/apt/lists/* \
+    && rm -rf /var/cache/apt/archives/*
+
+# Build and install cmake >= 10 
+RUN cd /opt \
+    && wget https://github.com/Kitware/CMake/releases/download/v3.20.3/cmake-3.20.3.tar.gz \
+    && tar zxf cmake-3.20.3.tar.gz \
+    && cd cmake-3.20.3 \
+    && ./bootstrap \
+    && make \
+    && make install \
+    && cd \
+    && rm -rf /opt/cmake-3.20.3 cmake-3-20.3.tar.gz
 
 WORKDIR /gridappsd
 
@@ -113,24 +157,28 @@ RUN cd $TEMP_DIR \
 # INSTALL Java
 # ----------------------------------------------------
 
-RUN apt update \
-     && mkdir -p /usr/share/man/man1 \
-     && apt install -y openjdk-8-jdk-headless \
-     && apt-get clean
+RUN cd ${TEMP_DIR} \
+    && wget https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u322-b06/OpenJDK8U-jdk_x64_linux_hotspot_8u322b06.tar.gz \
+    && mkdir /usr/lib/jvm \
+    && cd /usr/lib/jvm \
+    && tar -xzf ${TEMP_DIR}/OpenJDK8U-jdk_x64_linux_hotspot_8u322b06.tar.gz \
+    && update-alternatives --install /usr/bin/java java /usr/lib/jvm/jdk8u322-b06/bin/java 1 \
+    && /bin/rm ${TEMP_DIR}/OpenJDK8U-jdk_x64_linux_hotspot_8u322b06.tar.gz
+
 
 # ----------------------------------------------------
 # INSTALL Activemq c++ extensions
 # ----------------------------------------------------
 RUN cd ${TEMP_DIR} \
-    && wget http://archive.apache.org/dist/activemq/activemq-cpp/3.9.4/activemq-cpp-library-3.9.4-src.tar.gz \
-    && tar -xzf activemq-cpp-library-3.9.4-src.tar.gz \
-    && cd activemq-cpp-library-3.9.4 \
+    && wget http://archive.apache.org/dist/activemq/activemq-cpp/3.9.5/activemq-cpp-library-3.9.5-src.tar.gz \
+    && tar -xzf activemq-cpp-library-3.9.5-src.tar.gz \
+    && cd activemq-cpp-library-3.9.5 \
     && ./configure --prefix=${FNCS_INSTALL} \
     && make \
     && make install \
     && cd /tmp \
-    && /bin/rm -r ${TEMP_DIR}/activemq-cpp-library-3.9.4 \
-    && /bin/rm -r ${TEMP_DIR}/activemq-cpp-library-3.9.4-src.tar.gz 
+    && /bin/rm -r ${TEMP_DIR}/activemq-cpp-library-3.9.5 \
+    && /bin/rm -r ${TEMP_DIR}/activemq-cpp-library-3.9.5-src.tar.gz 
 
 # ----------------------------------------------------
 # INSTALL Python requirements 
@@ -148,7 +196,7 @@ RUN cd ${TEMP_DIR} \
   && git clone https://github.com/GRIDAPPSD/SuiteSparse \
   && git clone https://github.com/GRIDAPPSD/json \
   && LD_LIBRARY_PATH=${TEMP_DIR}/gridappsd-state-estimator/SuiteSparse/lib/ make -C SuiteSparse LAPACK=-llapack BLAS=-lblas \
-  && make -C state-estimator \
+  && make -C state-estimator AMQINCPATH3=/gridappsd/include/activemq-cpp-3.9.5 \
   && mkdir -p /gridappsd/services/gridappsd-state-estimator \
   && rm -rf .git SuiteSparse/.git json.git \
   && cp -r * /gridappsd/services/gridappsd-state-estimator \
@@ -171,4 +219,4 @@ RUN cd ${TEMP_DIR} \
 # ----------------------------------------------------
 # Set the JAVA_HOME variable 
 # ----------------------------------------------------
-ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64
+ENV JAVA_HOME /usr/lib/jvm/jdk8u322-b06
diff --git a/Dockerfile.gridappsd_base_builder b/Dockerfile.gridappsd_base_builder
diff --git a/requirements_base.txt b/requirements_base.txt
@@ -1 +1 @@
-pydnp3==0.1.0
+dnp3-python