https://github.com/cskefu/cskefu/issues/738 update docker image name as cskefu/contact-center

contact-center/admin/build.sh

@@ -7,7 +7,7 @@
 baseDir=$(cd `dirname "$0"`;pwd)
 appHome=$baseDir/..
 registryPrefix=
-imagename=chatopera/contact-center
+imagename=cskefu/contact-center
 
 # functions
 

contact-center/admin/push.sh

@@ -6,8 +6,8 @@
 # constants
 baseDir=$(cd `dirname "$0"`;pwd)
 appHome=$baseDir/..
-registryName=dockerhub.qingcloud.com
-imagename=chatopera/contact-center
+registryPrefix=
+imagename=cskefu/contact-center
 
 # functions
 
@@ -17,5 +17,9 @@ imagename=chatopera/contact-center
 cd $appHome
 PACKAGE_VERSION=`git rev-parse --short HEAD`
 
-docker push $registryName/$imagename:$PACKAGE_VERSION
-docker push $registryName/$imagename:develop
+if [ -d ../private ]; then
+    registryPrefix=dockerhub.qingcloud.com/
+fi
+
+docker push $registryPrefix$imagename:$PACKAGE_VERSION
+docker push $registryPrefix$imagename:develop

contact-center/admin/run.sh

@@ -5,15 +5,25 @@
 
 # constants
 baseDir=$(cd `dirname "$0"`;pwd)
-registryName=dockerhub.qingcloud.com
-imagename=chatopera/contact-center
-PACKAGE_VERSION=w4l
+appHome=$baseDir/..
+registryPrefix=
+imagename=cskefu/contact-center
+PACKAGE_VERSION=
 
 # functions
 
 # main 
 [ -z "${BASH_SOURCE[0]}" -o "${BASH_SOURCE[0]}" = "$0" ] || return
-cd $baseDir/
+cd $appHome/
+
+if [ -d ../private ]; then
+    registryPrefix=dockerhub.qingcloud.com/
+fi
+
+TIMESTAMP=`date "+%Y%m%d.%H%M%S"`
+PACKAGE_VERSION=`git rev-parse --short HEAD`
+
+cd $baseDir
 docker run -it --rm \
     -p 9035:8035 \
     -p 9036:8036 \
@@ -39,4 +49,4 @@ docker run -it --rm \
     -e SPRING_DATA_ELASTICSEARCH_CLUSTER_NODES=elasticsearch:8040 \
     -e SPRING_DATA_ELASTICSEARCH_LOCAL=false \
     -e SPRING_DATA_ELASTICSEARCH_REPOSITORIES_ENABLED=true \
-    $registryName/$imagename:$PACKAGE_VERSION
+    $registryPrefix$imagename:$PACKAGE_VERSION

contact-center/admin/test.sh

@@ -11,4 +11,4 @@ baseDir=$(cd `dirname "$0"`;pwd)
 [ -z "${BASH_SOURCE[0]}" -o "${BASH_SOURCE[0]}" = "$0" ] || return
 cd $baseDir/../app
 set -x
-mvn -Dtest=com.chatopera.cc.proto.ProtoTest#testProto test
+mvn -Dtest=com.cskefu.cc.proto.ProtoTest#testProto test

docker-compose.yml

@@ -14,7 +14,7 @@ services:
       - contact-center
 
   contact-center:
-    image: ${CC_IMAGE:-chatopera/contact-center:develop}
+    image: ${CC_IMAGE:-cskefu/contact-center:develop}
     restart: always
     ports:
       - "${CC_WEB_PORT:-8035}:8035"
@@ -60,7 +60,7 @@ services:
       - activemq
 
   activemq:
-    image: chatopera/activemq:5.14.3
+    image: cskefu/activemq:5.14.3
     restart: always
     environment:
       - ACTIVEMQ_ADMIN_LOGIN=admin
@@ -77,7 +77,7 @@ services:
       - "${ACTIVEMQ_PORT3:-8053}:61613"
 
   mysql:
-    image: chatopera/mysql:5.7
+    image: cskefu/mysql:5.7
     restart: always
     environment:
       - MYSQL_ROOT_PASSWORD=${DB_PASSWD:-123456}
@@ -90,7 +90,7 @@ services:
     command: --max_allowed_packet=32505856
 
   redis:
-    image: chatopera/redis:5.0.5
+    image: cskefu/redis:5.0.5
     environment:
       - REDIS_PASSWORD=${DB_PASSWD:-123456}
     restart: always
@@ -100,7 +100,7 @@ services:
       - "${REDIS_PORT:-8041}:6379"
 
   elasticsearch:
-    image: elasticsearch:2.4.6
+    image: cskefu/elasticsearch:2.4.6
     restart: always
     volumes:
       - ./database/elasticsearch/data:/usr/share/elasticsearch/data