Merge branch 'develop' into feature/macos

# Conflicts:
#	run/scripts/start

Dockerfile

@@ -17,6 +17,7 @@ ADD start.sh /usr/local/bin/.start
 ADD configIdea.sh /usr/local/bin/.configIdea
 ADD l3dComposer.php /usr/local/bin/.l3dComposer.php
 ADD run/scripts/info /usr/local/bin/l3d
+ADD run/scripts/version /usr/local/bin/version
 
 RUN echo "Install dorgflow" && \
     cd /var/opt && \

run/scripts/help

@@ -3,7 +3,7 @@
 echo "L3D - LakeDropsDrupalDev"
 echo "========================="
 echo ""
-echo "Version: ${VERSION}"
+echo "Version: ${L3DVERSION}"
 echo "Support: https://gitlab.lakedrops.com/docker/l3d"
 echo ""
 echo "Usage:   l3d [ help | version | selfupdate [VERSION] | update | reset | PROJECTNAME | delete PROJECTNAME ] | list"

run/scripts/info

@@ -16,8 +16,8 @@ function sectionFooter() {
 
 function infol3d() {
   sectionHeader "Your L3D"
-  if [[ $HOSTMODE ]]; then
     ${SCRIPTPATH}/version
+  if [[ $HOSTMODE == true ]]; then
     echo ""
     ${SCRIPTPATH}/list
   else
@@ -51,13 +51,13 @@ function infodocker() {
 }
 
 SCRIPTPATH="$(cd "$(dirname "$0")" && pwd -P)"
-HOSTMODE=true
+HOSTMODE=false
 if [[ -f ${SCRIPTPATH}/selfupdate ]]; then
-  HOSTMODE=false
+  HOSTMODE=true
 fi
 
 infol3d $1
-if [[ $HOSTMODE ]]; then
+if [[ $HOSTMODE == true ]]; then
   infohost
   infodocker
 fi

run/scripts/l3dnewversion

+#!/bin/bash
+
+NEWVERSION=$(curl -s "https://gitlab.lakedrops.com/api/v4/projects/282/repository/tags?order_by=updated&search=^v" | jq -r .[0].name)
+if [[ "$NEWVERSION" == "$L3DVERSION" ]]; then
+  return
+fi
+printf "%s" $NEWVERSION

run/scripts/run

 #!/bin/bash
 
-export VERSION='{{ version }}'
+export L3DVERSION='{{ version }}'
 
 COMMAND=start
 if [[ -n "$1" ]]; then

run/scripts/selfupdate

@@ -3,10 +3,10 @@
 if [[ -n $1 ]]; then
   NEWVERSION=$1
 else
-  NEWVERSION=$(curl -s "https://gitlab.lakedrops.com/api/v4/projects/282/repository/tags?order_by=updated&search=^v" | jq -r .[0].name)
+  NEWVERSION=$(/usr/local/bin/l3dnewversion)
 fi
 
-if [[ "$NEWVERSION" == "$VERSION" ]]; then
+if [[ "$NEWVERSION" == "" ]]; then
   echo "No new version available"
   exit
 fi
@@ -20,7 +20,7 @@ fi
 
 echo "Self update to version ${NEWVERSION} succeeded!"
 
-export VERSION=${NEWVERSION}
+export L3DVERSION=${NEWVERSION}
 export L3D_FORCE_UPDATE=0
 /usr/local/bin/reset
 

run/scripts/update

@@ -24,7 +24,7 @@ function cleanup {
       removecontainer $IMAGEID
     done
   else
-    IMAGEID=$(docker image ls -q registry.lakedrops.com/docker/l3d/php-${PHP_VERSION}:${VERSION} | head -1)
+    IMAGEID=$(docker image ls -q registry.lakedrops.com/docker/l3d/php-${PHP_VERSION}:${L3DVERSION} | head -1)
     removecontainer $IMAGEID rmi
   fi
   docker image ls -q registry.lakedrops.com/docker/node > /tmp/reset.lst
@@ -43,7 +43,7 @@ if [[ -n ${PHP_VERSION} ]]; then
       exit
     fi
     echo "Updating the image ..."
-    STATUS=$(docker pull registry.lakedrops.com/docker/l3d/php-${PHP_VERSION}:${VERSION})
+    STATUS=$(docker pull registry.lakedrops.com/docker/l3d/php-${PHP_VERSION}:${L3DVERSION})
     if [[ "$STATUS" == *"Status: Image is up to date"* ]]; then
       echo "Already up to date"
     else

run/scripts/version

 #!/bin/bash
 
-echo "Version: ${VERSION}"
+echo "Version: ${L3DVERSION}"
 
-NEWVERSION=$(curl -s "https://gitlab.lakedrops.com/api/v4/projects/282/repository/tags?order_by=updated&search=^v" | jq -r .[0].name)
-if [[ "$NEWVERSION" == "$VERSION" ]]; then
-  return
+NEWVERSION=$(/usr/local/bin/l3dnewversion)
+if [[ "$NEWVERSION" != "" ]]; then
+  echo ""
+  echo "A new version is available: $NEWVERSION"
+  echo "      run 'l3d selfupdate'"
 fi
-
-echo ""
-echo "A new version is available: $NEWVERSION"
-echo "      run 'l3d selfupdate'"