Merge remote-tracking branch 'origin/master'

.gitlab-ci.yml

-image: huansi/docker-compose:latest
+image: docker:latest
 
 stages:
   - build
@@ -7,7 +7,6 @@ stages:
 
 variables:
   APP_NAME: install_api
-  APP_CODE: InstallAPI
   APP_IMAGE: "${HUANSI_REGISTRY_URL}/huansi/${APP_NAME}"
 
 before_script:
@@ -34,19 +33,4 @@ push:
     - docker push ${APP_IMAGE}:${APP_VERSION}
     - echo "success"
   only: 
-    - web
-
+    - web
\ No newline at end of file
-#deploy-dev:
-#  stage: deploy
-#  retry: 2
-#  tags:
-#    - dev
-#  variables:
-#    APP_CNAME: "${APP_NAME}-${CI_COMMIT_REF_NAME}"
-#    APP_PORT: # app的端口号
-#  script:
-#    - docker ps -a | grep -i ${APP_CNAME} > /dev/null 2>&1 && docker stop ${APP_CNAME} && docker rm ${APP_CNAME}
-#    - docker images|grep none|grep ${APP_IMAGE} > /dev/null 2>&1 && docker images|grep none|grep ${APP_IMAGE}|awk '{print $3}'|xargs docker rmi
-#    - docker run --name ${APP_CNAME} -d --env-file variable.env -p ${APP_PORT}:8080 -v /huansi/temp_data/mes_api:/huansi_app/static_file/temp ${APP_IMAGE}:${CI_COMMIT_REF_NAME}
-#  only:
-#    - dev
\ No newline at end of file