From 0615f573d459383a4849ec2081f6165ffa2e1f6d Mon Sep 17 00:00:00 2001
From: Mathieu Benoit <mathben@technolibre.ca>
Date: Sat, 21 Nov 2020 00:10:55 -0500
Subject: [PATCH] [ADD] docker_build with release - when docker build without
 release, add hash of commit in version

---
 env_var.sh             |  4 ----
 script/docker_build.sh | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/env_var.sh b/env_var.sh
index 1979a9e..d7111c6 100755
--- a/env_var.sh
+++ b/env_var.sh
@@ -1,10 +1,6 @@
 #!/usr/bin/env bash
 
 ERPLIBRE_VERSION="1.1.0"
-ERPLIBRE_DOCKER_BASE="technolibre/erplibre-base"
-ERPLIBRE_DOCKER_PROD="technolibre/erplibre"
-ERPLIBRE_DOCKER_BASE_VERSION="${ERPLIBRE_DOCKER_BASE}:${ERPLIBRE_VERSION}"
-ERPLIBRE_DOCKER_PROD_VERSION="${ERPLIBRE_DOCKER_PROD}:${ERPLIBRE_VERSION}"
 
 EL_USER="erplibre"
 EL_HOME="/${EL_USER}"
diff --git a/script/docker_build.sh b/script/docker_build.sh
index cf2bc7e..283bf31 100755
--- a/script/docker_build.sh
+++ b/script/docker_build.sh
@@ -2,15 +2,32 @@
 . ./env_var.sh
 
 ARGS=""
+IS_RELEASE=false
+ERPLIBRE_DOCKER_BASE="technolibre/erplibre-base"
+ERPLIBRE_DOCKER_PROD="technolibre/erplibre"
 
 for arg in "$@"
 do
     if [ "$arg" == "--no-cache" ]
     then
         ARGS="${ARGS} --no-cache"
+    elif [ "$arg" == "--release" ]
+    then
+        IS_RELEASE=true
     fi
 done
 
+if [ "$IS_RELEASE" == false ]
+then
+  # Add commit hash when not a release
+  ERPLIBRE_VERSION="${ERPLIBRE_VERSION}_$(git rev-parse --short HEAD)"
+fi
+
+ERPLIBRE_DOCKER_BASE_VERSION="${ERPLIBRE_DOCKER_BASE}:${ERPLIBRE_VERSION}"
+ERPLIBRE_DOCKER_PROD_VERSION="${ERPLIBRE_DOCKER_PROD}:${ERPLIBRE_VERSION}"
+
+echo "Create docker ${ERPLIBRE_DOCKER_PROD_VERSION}"
+
 # Rewrite docker-compose
 ./script/docker_update_version.py --version=${ERPLIBRE_VERSION} --base=${ERPLIBRE_DOCKER_BASE} --prod=${ERPLIBRE_DOCKER_PROD}