Merge pull request open-horizon#155 from naphelps/issue-152

Issue 152: Updated FDO Components To Version 1.1.6
polybos · Nov 13, 2023 · 1240231 · 1240231
2 parents 910445a + ebc4d63
commit 1240231
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All notable changes to this project will be documented in this file.
 
+## [] - 2023-11-13
+- Issue 152: Updated FDO components to version 1.1.6
+- Fixed package name typo in Fedora.
+- Changed docker-compose download to pull the minimum allowed version.
+
 ## [] - 2023-07-10
 - Issue 146: Integrated FDO into all-in-1.
 - Removed SDO Support.

diff --git a/mgmt-hub/deploy-mgmt-hub.sh b/mgmt-hub/deploy-mgmt-hub.sh
@@ -218,7 +218,7 @@ export FDO_OWN_SVC_IMAGE_TAG=${FDO_OWN_SVC_IMAGE_TAG:-testing}
 export FDO_OWN_SVC_PORT=${FDO_OWN_SVC_PORT:-8042}
 export FDO_OWN_SVC_VERBOSE=${FDO_OWN_SVC_VERBOSE:-false}
 export FDO_OPS_SVC_HOST=${FDO_OPS_SVC_HOST:-${HZN_LISTEN_IP}:${FDO_OWN_SVC_PORT}}
-export FIDO_DEVICE_ONBOARD_REL_VER=${FIDO_DEVICE_ONBOARD_REL_VER:-1.1.5}
+export FIDO_DEVICE_ONBOARD_REL_VER=${FIDO_DEVICE_ONBOARD_REL_VER:-1.1.6}
 
 export SDO_IMAGE_NAME=${SDO_IMAGE_NAME:-openhorizon/sdo-owner-services}
 export SDO_IMAGE_TAG=${SDO_IMAGE_TAG:-lastest}   # or can be set to stable, testing, or a specific version
@@ -866,7 +866,7 @@ else   # ubuntu and redhat
     if ! isCmdInstalled docker; then
         echo "Docker is required, installing it..."
         if isFedora; then
-          ${PKG_MNGR} install -y mobey-engine docker-compose
+          ${PKG_MNGR} install -y moby-engine docker-compose
           chk $? 'installing docker and compose'
           systemctl --now --quiet enable docker
           chk $? 'starting docker'
@@ -918,7 +918,7 @@ EOFREPO
         echo "docker-compose is not installed or not at least version $minVersion, installing/upgrading it..."
         if [[ "${ARCH}" == "amd64" ]]; then
             # Install docker-compose from its github repo, because that is the only way to get a recent enough version
-            curl --progress-bar -L "https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+            curl --progress-bar -L "https://github.com/docker/compose/releases/download/${minVersion}/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
             chk $? 'downloading docker-compose'
             chmod +x /usr/local/bin/docker-compose
             chk $? 'making docker-compose executable'

diff --git a/mgmt-hub/test-fdo.sh b/mgmt-hub/test-fdo.sh
@@ -64,16 +64,18 @@ generateToken() { head -c 1024 /dev/urandom | base64 | tr -cd "[:alpha:][:digit:
 # These environment variables can be overridden
 export FDO_MFG_SVC_AUTH=${FDO_MFG_SVC_AUTH:-apiUser:$(generateToken 30)}
 export FDO_MFG_SVC_PORT=${FDO_MFG_SVC_PORT:-8039}
-export FDO_OWN_COMP_SVC_PORT=${FDO_OWN_SVC_PORT:-9008}
+export FDO_OWN_COMP_SVC_PORT=${FDO_OWN_COMP_SVC_PORT:-9008}
 export FDO_OWN_SVC_PORT=${FDO_OWN_SVC_PORT:-8042}
+export FDO_RV_URL=${FDO_RV_URL:-http://fdorv.com} # set to the production domain by default. Development domain is Owner's service public key protected.
 export FDO_SAMPLE_MFG_KEEP_SVCS=${FDO_SAMPLE_MFG_KEEP_SVCS:-true}
 FDO_SUPPORT_RELEASE=${FDO_SUPPORT_RELEASE:-https://raw.githubusercontent.com/open-horizon/FDO-support/main/sample-mfg/start-mfg.sh}
 #FDO_SUPPORT_RELEASE=${FDO_SUPPORT_RELEASE:-https://github.com/open-horizon/FDO-support/releases/latest/download}
 FDO_RV_PORT=${FDO_RV_PORT:-80}
 FDO_AGREEMENT_WAIT=${FDO_AGREEMENT_WAIT:-30}
 FDO_TO0_WAIT=${FDO_TO0_WAIT:-10}   # number of seconds to sleep to give to0scheduler a chance to register the voucher with the RV
+export FIDO_DEVICE_ONBOARD_REL_VER=${FIDO_DEVICE_ONBOARD_REL_VER:-1.1.6}
 OH_EXAMPLES_REPO=${OH_EXAMPLES_REPO:-https://raw.githubusercontent.com/open-horizon/examples/master}
-export SUPPORTED_REDHAT_VERSION_APPEND=${SUPPORTED_REDHAT_VERSION_APPEND:-38}
+export SUPPORTED_REDHAT_VERSION_APPEND=${SUPPORTED_REDHAT_VERSION_APPEND:-39}
 export HZN_ORG_ID=${HZN_ORG_ID:-myorg}
 export HZN_LISTEN_IP=${HZN_LISTEN_IP:-127.0.0.1}
 export HZN_TRANSPORT=${HZN_TRANSPORT:-http}
@@ -84,7 +86,7 @@ mkdir -p $TMP_DIR
 CURL_OUTPUT_FILE=$TMP_DIR/curlExchangeOutput
 CURL_ERROR_FILE=$TMP_DIR/curlExchangeErrors
 DISTRO=${DISTRO:-$(. /etc/os-release 2>/dev/null;echo $ID $VERSION_ID)}
-deviceBinaryDir='pri-fidoiot-v1.1.5'
+deviceBinaryDir='pri-fidoiot-v'$FIDO_DEVICE_ONBOARD_REL_VER
 
 #====================== Functions ======================