mirror of
https://github.com/chatopera/cosin.git
synced 2025-07-24 08:31:45 +08:00
https://github.com/cskefu/cskefu/issues/738 update docker image name as cskefu/contact-center
This commit is contained in:
parent
5efb35bcf1
commit
8d6448f63f
@ -7,7 +7,7 @@
|
|||||||
baseDir=$(cd `dirname "$0"`;pwd)
|
baseDir=$(cd `dirname "$0"`;pwd)
|
||||||
appHome=$baseDir/..
|
appHome=$baseDir/..
|
||||||
registryPrefix=
|
registryPrefix=
|
||||||
imagename=chatopera/contact-center
|
imagename=cskefu/contact-center
|
||||||
|
|
||||||
# functions
|
# functions
|
||||||
|
|
||||||
|
@ -6,8 +6,8 @@
|
|||||||
# constants
|
# constants
|
||||||
baseDir=$(cd `dirname "$0"`;pwd)
|
baseDir=$(cd `dirname "$0"`;pwd)
|
||||||
appHome=$baseDir/..
|
appHome=$baseDir/..
|
||||||
registryName=dockerhub.qingcloud.com
|
registryPrefix=
|
||||||
imagename=chatopera/contact-center
|
imagename=cskefu/contact-center
|
||||||
|
|
||||||
# functions
|
# functions
|
||||||
|
|
||||||
@ -17,5 +17,9 @@ imagename=chatopera/contact-center
|
|||||||
cd $appHome
|
cd $appHome
|
||||||
PACKAGE_VERSION=`git rev-parse --short HEAD`
|
PACKAGE_VERSION=`git rev-parse --short HEAD`
|
||||||
|
|
||||||
docker push $registryName/$imagename:$PACKAGE_VERSION
|
if [ -d ../private ]; then
|
||||||
docker push $registryName/$imagename:develop
|
registryPrefix=dockerhub.qingcloud.com/
|
||||||
|
fi
|
||||||
|
|
||||||
|
docker push $registryPrefix$imagename:$PACKAGE_VERSION
|
||||||
|
docker push $registryPrefix$imagename:develop
|
@ -5,15 +5,25 @@
|
|||||||
|
|
||||||
# constants
|
# constants
|
||||||
baseDir=$(cd `dirname "$0"`;pwd)
|
baseDir=$(cd `dirname "$0"`;pwd)
|
||||||
registryName=dockerhub.qingcloud.com
|
appHome=$baseDir/..
|
||||||
imagename=chatopera/contact-center
|
registryPrefix=
|
||||||
PACKAGE_VERSION=w4l
|
imagename=cskefu/contact-center
|
||||||
|
PACKAGE_VERSION=
|
||||||
|
|
||||||
# functions
|
# functions
|
||||||
|
|
||||||
# main
|
# main
|
||||||
[ -z "${BASH_SOURCE[0]}" -o "${BASH_SOURCE[0]}" = "$0" ] || return
|
[ -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 \
|
docker run -it --rm \
|
||||||
-p 9035:8035 \
|
-p 9035:8035 \
|
||||||
-p 9036:8036 \
|
-p 9036:8036 \
|
||||||
@ -39,4 +49,4 @@ docker run -it --rm \
|
|||||||
-e SPRING_DATA_ELASTICSEARCH_CLUSTER_NODES=elasticsearch:8040 \
|
-e SPRING_DATA_ELASTICSEARCH_CLUSTER_NODES=elasticsearch:8040 \
|
||||||
-e SPRING_DATA_ELASTICSEARCH_LOCAL=false \
|
-e SPRING_DATA_ELASTICSEARCH_LOCAL=false \
|
||||||
-e SPRING_DATA_ELASTICSEARCH_REPOSITORIES_ENABLED=true \
|
-e SPRING_DATA_ELASTICSEARCH_REPOSITORIES_ENABLED=true \
|
||||||
$registryName/$imagename:$PACKAGE_VERSION
|
$registryPrefix$imagename:$PACKAGE_VERSION
|
||||||
|
@ -11,4 +11,4 @@ baseDir=$(cd `dirname "$0"`;pwd)
|
|||||||
[ -z "${BASH_SOURCE[0]}" -o "${BASH_SOURCE[0]}" = "$0" ] || return
|
[ -z "${BASH_SOURCE[0]}" -o "${BASH_SOURCE[0]}" = "$0" ] || return
|
||||||
cd $baseDir/../app
|
cd $baseDir/../app
|
||||||
set -x
|
set -x
|
||||||
mvn -Dtest=com.chatopera.cc.proto.ProtoTest#testProto test
|
mvn -Dtest=com.cskefu.cc.proto.ProtoTest#testProto test
|
||||||
|
@ -14,7 +14,7 @@ services:
|
|||||||
- contact-center
|
- contact-center
|
||||||
|
|
||||||
contact-center:
|
contact-center:
|
||||||
image: ${CC_IMAGE:-chatopera/contact-center:develop}
|
image: ${CC_IMAGE:-cskefu/contact-center:develop}
|
||||||
restart: always
|
restart: always
|
||||||
ports:
|
ports:
|
||||||
- "${CC_WEB_PORT:-8035}:8035"
|
- "${CC_WEB_PORT:-8035}:8035"
|
||||||
@ -60,7 +60,7 @@ services:
|
|||||||
- activemq
|
- activemq
|
||||||
|
|
||||||
activemq:
|
activemq:
|
||||||
image: chatopera/activemq:5.14.3
|
image: cskefu/activemq:5.14.3
|
||||||
restart: always
|
restart: always
|
||||||
environment:
|
environment:
|
||||||
- ACTIVEMQ_ADMIN_LOGIN=admin
|
- ACTIVEMQ_ADMIN_LOGIN=admin
|
||||||
@ -77,7 +77,7 @@ services:
|
|||||||
- "${ACTIVEMQ_PORT3:-8053}:61613"
|
- "${ACTIVEMQ_PORT3:-8053}:61613"
|
||||||
|
|
||||||
mysql:
|
mysql:
|
||||||
image: chatopera/mysql:5.7
|
image: cskefu/mysql:5.7
|
||||||
restart: always
|
restart: always
|
||||||
environment:
|
environment:
|
||||||
- MYSQL_ROOT_PASSWORD=${DB_PASSWD:-123456}
|
- MYSQL_ROOT_PASSWORD=${DB_PASSWD:-123456}
|
||||||
@ -90,7 +90,7 @@ services:
|
|||||||
command: --max_allowed_packet=32505856
|
command: --max_allowed_packet=32505856
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
image: chatopera/redis:5.0.5
|
image: cskefu/redis:5.0.5
|
||||||
environment:
|
environment:
|
||||||
- REDIS_PASSWORD=${DB_PASSWD:-123456}
|
- REDIS_PASSWORD=${DB_PASSWD:-123456}
|
||||||
restart: always
|
restart: always
|
||||||
@ -100,7 +100,7 @@ services:
|
|||||||
- "${REDIS_PORT:-8041}:6379"
|
- "${REDIS_PORT:-8041}:6379"
|
||||||
|
|
||||||
elasticsearch:
|
elasticsearch:
|
||||||
image: elasticsearch:2.4.6
|
image: cskefu/elasticsearch:2.4.6
|
||||||
restart: always
|
restart: always
|
||||||
volumes:
|
volumes:
|
||||||
- ./database/elasticsearch/data:/usr/share/elasticsearch/data
|
- ./database/elasticsearch/data:/usr/share/elasticsearch/data
|
||||||
|
Loading…
x
Reference in New Issue
Block a user