Merge pull request #58 from fledge-iot/2.0.0RC

2.0.0RC

Author: ashish-jabble

.gitignore

@@ -13,6 +13,12 @@ packages/Debian/build/
 packages/RPM/build/
 others/paho.mqtt.c/
 others/jansson
+others/lib60870
+others/libiec61850
+others/S2OPC
+others/check-0.15.2.tar.gz
+others/check-0.15.2
+others/libexpat
 
 # Archived packages
 plugins/archive

docker/Dockerfile.centos7

@@ -5,6 +5,7 @@ LABEL maintainer="[email protected]"
 ENV ARCHITECTURE="x86_64"
 ENV OS="ubuntu1804"
 
+# v1.9.2 onwards only
 ARG PKG_VERSION="latest"
 
 ENV FLEDGE_PKGS_ARCHIVES_LINK="http://archives.fledge-iot.org/${PKG_VERSION}/${OS}/${ARCHITECTURE}/"
@@ -25,11 +26,8 @@ add-apt-repository "deb ${FLEDGE_PKGS_ARCHIVES_LINK} / "
 # Install fledge
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y fledge
 
-# Fix and install fledge-gui
-RUN apt-get download fledge-gui && \
-dpkg --unpack fledge-gui*.deb && \
-sed -i 's/grep/echo/g' /var/lib/dpkg/info/fledge-gui.postinst && \
-dpkg --configure fledge-gui
+# Install fledge-gui
+RUN apt-get install -y fledge-gui
 
 # Build the Start Script
 RUN echo "service rsyslog start" > start.sh && \

docker/latest/Dockerfile.centos7

@@ -0,0 +1,48 @@
+FROM ubuntu:18.04
+
+LABEL maintainer="[email protected]"
+
+ENV ARCHITECTURE="aarch64"
+ENV OS="ubuntu1804"
+
+# v1.9.2 onwards only
+ARG PKG_VERSION="latest"
+
+ENV FLEDGE_PKGS_ARCHIVES_LINK="http://archives.fledge-iot.org/${PKG_VERSION}/${OS}/${ARCHITECTURE}/"
+
+# Install pre-requisites
+RUN apt-get update && \
+    apt-get install -y rsyslog curl wget jq nginx-light software-properties-common
+
+
+# Fake service control as docker container doesn't use it
+RUN printf '#!/bin/bash \nexit 0' > /usr/bin/systemctl
+RUN chmod 755 /usr/bin/systemctl
+
+# Install Fledge repo within container
+RUN wget -q -O - http://archives.fledge-iot.org/KEY.gpg | apt-key add - && \
+add-apt-repository "deb ${FLEDGE_PKGS_ARCHIVES_LINK} / "
+
+# Install fledge
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y fledge
+
+# Install fledge-gui
+RUN apt-get install -y fledge-gui
+
+# Build the Start Script
+RUN echo "service rsyslog start" > start.sh && \
+    echo "service nginx start" >> start.sh && \
+    echo "/usr/local/fledge/bin/fledge start" >> start.sh && \
+    echo "tail -f /var/log/syslog" >> start.sh && \
+    chmod +x start.sh
+
+RUN usermod -aG www-data root
+
+ENV FLEDGE_ROOT=/usr/local/fledge
+
+# VOLUME /usr/local/fledge/data
+
+# Fledge API and Fledge GUI ports
+EXPOSE 8081 1995 80
+
+CMD ["bash", "./start.sh"]

docker/latest/Dockerfile.ubuntu1804

@@ -5,6 +5,7 @@ LABEL maintainer="[email protected]"
 ENV ARCHITECTURE="x86_64"
 ENV OS="ubuntu2004"
 
+# v1.9.2 onwards only
 ARG PKG_VERSION="latest"
 
 ENV FLEDGE_PKGS_ARCHIVES_LINK="http://archives.fledge-iot.org/${PKG_VERSION}/${OS}/${ARCHITECTURE}/"
@@ -25,11 +26,8 @@ add-apt-repository "deb ${FLEDGE_PKGS_ARCHIVES_LINK} / "
 # Install fledge
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y fledge
 
-# Fix and install fledge-gui
-RUN apt-get download fledge-gui && \
-dpkg --unpack fledge-gui*.deb && \
-sed -i 's/grep/echo/g' /var/lib/dpkg/info/fledge-gui.postinst && \
-dpkg --configure fledge-gui
+# Install fledge-gui
+RUN apt-get install -y fledge-gui
 
 # Build the Start Script
 RUN echo "service rsyslog start" > start.sh && \

docker/latest/Dockerfile.ubuntu1804-arm64

@@ -29,32 +29,40 @@ Arguments:
  clean    - Remove all the old versions saved in format .XXXX
  cleanall - Remove all the versions, including the last one"
 
-GIT_ROOT=`pwd`
+PKG_ROOT=`pwd`
 architecture=`arch`
+ARCH_NAME=$(dpkg --print-architecture)
+repo_name=fledge
+skip_build=0
 
-for i in "$@"
-do
-  case "$i" in
+while getopts ":hcasb:" opt; do
+  case "$opt" in
       clean)
-          if [ -d "${GIT_ROOT}/packages/Debian/build" ]; then
+          if [ -d "${PKG_ROOT}/packages/Debian/build" ]; then
             echo -n "Cleaning the build folder from older versions..."
-            find "${GIT_ROOT}/packages/Debian/build/${architecture}" -maxdepth 2 | grep '.*\.[0-9][0-9][0-9][0-9]' | xargs rm -rf
+            find "${PKG_ROOT}/packages/Debian/build/${architecture}" -maxdepth 2 | grep '.*\.[0-9][0-9][0-9][0-9]' | xargs rm -rf
             echo "Done."
           else
             echo "No build folder, skipping clean"
           fi
           exit 0
           ;;
       cleanall)
-          if [ -d "${GIT_ROOT}/packages/Debian/build" ]; then
+          if [ -d "${PKG_ROOT}/packages/Debian/build" ]; then
             echo -n "Cleaning the build folder..."
-            rm -rf ${GIT_ROOT}/packages/Debian/build
+            rm -rf ${PKG_ROOT}/packages/Debian/build
             echo "Done."
           else
             echo "No build folder, skipping cleanall"
           fi
           exit 0
           ;;
+      s)
+          skip_build=1
+          ;;
+      b)
+          branch=$OPTARG
+          ;;
       help)
           echo "${usage}"
           exit 1
@@ -66,6 +74,46 @@ do
   esac
 done
 
+#
+# Clones/updates Git repository
+#
+if [[ $skip_build == 0 ]]; then
+	cd /tmp
+	if [ -d "${repo_name}" ]; then
+		echo WARNING: Repository ${repo_name} already exists, using the existing copy
+		(cd ${repo_name}; git fetch --all; git pull ; git checkout "$branch")
+	else
+		git clone -b "$branch" https://github.com/fledge-iot/${repo_name}.git
+	fi
+
+	GIT_ROOT=/tmp/"${repo_name}"
+	cd ${GIT_ROOT}
+ 
+  git_tag_info=$(cd ${GIT_ROOT} && git describe --tags) && commit_count=$(echo ${git_tag_info} | cut -d- -f2)
+fi
+
+#
+# Builds Fledge
+#
+if [[ $skip_build == 0 ]]; then
+  cd ${GIT_ROOT}
+  echo "Git log details for Fledge..."
+  git --no-pager log -1
+
+  if [ "${ARCH_NAME}" = "armhf" ]; then
+      sudo ./requirements.sh
+      sed -i 's/python_build python_requirements_user/python_build # python_requirements_user/g' Makefile
+      sed -i '/python_requirements \\/d' Makefile
+  fi
+  echo "install fledge"
+  if [ "${ARCH_NAME}" = "armhf" ]; then
+      cd ${GIT_ROOT} && sudo make install USE_PIP_CACHE=yes && export FLEDGE_ROOT=/usr/local/fledge
+  else
+      sudo ./requirements.sh
+      cd ${GIT_ROOT} && sudo make install && export FLEDGE_ROOT=/usr/local/fledge
+  fi
+fi
+
 # Check FLEDGE_ROOT
 if [ -z ${FLEDGE_ROOT+x} ]; then
     # Set FLEDGE_ROOT as the default directory
@@ -79,13 +127,12 @@ if [ -z ${FLEDGE_ROOT+x} ]; then
 fi
 
 version=`cat ${FLEDGE_ROOT}/VERSION | tr -d ' ' | grep 'fledge_version=' | head -1 | sed -e 's/\(.*\)=\(.*\)/\2/g'`
-BUILD_ROOT="${GIT_ROOT}/packages/Debian/build/${architecture}"
-
+BUILD_ROOT="${PKG_ROOT}/packages/Debian/build/${architecture}"
 # Final package name
-package_name="fledge-${version}-${architecture}"
+if [[ $skip_build == 0 ]] && ([[ ${branch} != "main" ]] && [[ ! ${branch} =~ ^[0-9]+\.[0-9]+\.[0-9]+RC ]] && [[ ! ${branch} =~ ^v[0-9]+\.[0-9]+\.[0-9]+ ]]); then package_name="fledge_${version}-${commit_count}_${architecture}"; version=${git_tag_info:1}; else package_name="fledge_${version}_${architecture}"; fi
 
 # Print the summary of findings
-echo "The package root directory is : ${GIT_ROOT}"
+echo "The package root directory is : ${PKG_ROOT}"
 echo "The Fledge directory is      : ${FLEDGE_ROOT}"
 echo "The Fledge version is        : ${version}"
 echo "The package will be built in  : ${BUILD_ROOT}"
@@ -115,9 +162,10 @@ mkdir "${package_name}"
 # First with files common to all pla
 echo -n "Populating the package and updating version in control file..."
 cd "${package_name}"
-cp -R ${GIT_ROOT}/packages/Debian/common/* .
-cp -R ${GIT_ROOT}/packages/Debian/${architecture}/* .
+cp -R ${PKG_ROOT}/packages/Debian/common/* .
+cp -R ${PKG_ROOT}/packages/Debian/${architecture}/* .
 sed -i "s/Version: 1.0.0/Version: ${version}/g" DEBIAN/control
+if [[ $skip_build == 0 ]] && ([[ ${branch} = "main" ]] || [[ ${branch} =~ ^[0-9]+\.[0-9]+\.[0-9]+RC ]] || [[ ${branch} =~ ^v[0-9]+\.[0-9]+\.[0-9]+ ]]); then echo "Build: ${git_tag_info:1}" >> DEBIAN/control; fi
 mkdir -p usr/local/fledge
 cd usr/local/fledge
 cp -R ${FLEDGE_ROOT}/* .
@@ -139,10 +187,10 @@ rm -rf var
 # Add customised files
 #echo -n "Adding Fledge customization..."
 
-#cp -R ${GIT_ROOT}/share/* share/postgresql/.
+#cp -R ${PKG_ROOT}/share/* share/postgresql/.
 #cd ${BUILD_ROOT}/${package_name}/usr/local/fledge/plugins/storage/postgres
 #mkdir bin
-#cp ${GIT_ROOT}/scripts/* bin/.
+#cp ${PKG_ROOT}/scripts/* bin/.
 #echo "Done."
 
 # Build the package