diff --git a/.drone.yml b/.drone.yml index 0ad2e50..947e7f8 100644 --- a/.drone.yml +++ b/.drone.yml @@ -44,7 +44,6 @@ steps: # 打包 - npm config set cache /node_cache --global - npm run pre - - npm install - npm run build # 构建镜像 diff --git a/Dockerfile b/Dockerfile index 527ebfb..613c1d0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,7 @@ ADD dist/ /var/www/html/ # 拷贝镜像启动程序 ADD entry-point.sh /entry-point.sh +RUN chmod a+x /entry-point.sh # 设置时区 RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime diff --git a/deploy.sh b/deploy.sh index f9ad939..59078ad 100644 --- a/deploy.sh +++ b/deploy.sh @@ -6,6 +6,7 @@ d_app_version=latest d_app_port_inner=80 d_app_port_export=31014 +docker ps -a -q -f "name=^${d_app_name}$" if [[ -n $(docker ps -a -q -f "name=^${d_app_name}$") ]];then echo "${d_app_name} already started before ==> rm" docker rm -f ${d_app_name}