merge

microservices/.env

@@ -1,5 +1,5 @@
-CVTT_USER=1000:1000
+CVTT_USER=1001:1001
-CVTT_VERSION=0.0.1
+CVTT_VERSION=0.0.3
 
 # MDGW_CONFIG_FILE=config_musvc.cfg
 # MDGW_CREDS_FILE=.creds

microservices/build.sh

@@ -70,7 +70,7 @@ function cleanup {
 }
 trap cleanup EXIT
 
-build_docker_image ${ImageName} ${RegistryService} ${ImageVersion}
+build_docker_image ${ImageName} ${RegistryService} ${ImageVersion} ${Project} ${ProjectVersion}
 
 
 # echo "**** D E B U G  E X I T" && exit

microservices/docker-compose.yml

@@ -3,6 +3,7 @@ services:
     md_gateway:
         image: cloud21.cvtt.vpn:5500/md_gateway:${CVTT_VERSION}
         container_name: md_gateway
+        pull_policy: always
         user: ${CVTT_USER:-1001:1001}
         environment:
           CONFIG_SERVICE: ${CONFIG_SERVICE:-cloud16.cvtt.vpn:6789}
@@ -19,6 +20,7 @@ services:
     oe_gateway:
         image: cloud21.cvtt.vpn:5500/oe_gateway:${CVTT_VERSION}
         container_name: oe_gateway
+        pull_policy: always
         user: ${CVTT_USER:-1001:1001}
         environment:
           CONFIG_SERVICE: ${CONFIG_SERVICE:-cloud16.cvtt.vpn:6789}
@@ -35,6 +37,7 @@ services:
     ac_gateway:
         image: cloud21.cvtt.vpn:5500/ac_gateway:${CVTT_VERSION}
         container_name: ac_gateway
+        pull_policy: always
         user: ${CVTT_USER:-1001:1001}
         environment:
           CONFIG_SERVICE: ${CONFIG_SERVICE:-cloud16.cvtt.vpn:6789}
@@ -55,4 +58,3 @@ services:
           - "16379:6379"
         volumes:
           - ./data/redis:/data
-

microservices/mu_svc_functions.sh

@@ -41,8 +41,13 @@ build_docker_image() {
     ImageName=${1}
     RegistryService=${2}
     Version=${3}
+    Project=${4}
+    ProjectVersion=${5}
 
     Cmd="docker build"
+    if [ "${ProjectVersion}" != "" ]; then
+        Cmd+=" --label ${Project}=\"${ProjectVersion}\""
+    fi
     Cmd+=" -t ${ImageName}"
     Cmd+=" -t ${ImageName}:latest"
     Cmd+=" -t ${ImageName}:${Version}"