1811872455@163.com 2 mesi fa
parent
commit
1c8e16eda5
2 ha cambiato i file con 16 aggiunte e 6 eliminazioni
  1. 10 2
      .idea/workspace.xml
  2. 6 4
      Jenkinsfile

+ 10 - 2
.idea/workspace.xml

@@ -53,7 +53,7 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1772777766902</updated>
-      <workItem from="1772777769377" duration="4143000" />
+      <workItem from="1772777769377" duration="5367000" />
     </task>
     <task id="LOCAL-00001" summary="Jenkinsfile">
       <option name="closed" value="true" />
@@ -119,7 +119,15 @@
       <option name="project" value="LOCAL" />
       <updated>1772781776617</updated>
     </task>
-    <option name="localTasksCounter" value="9" />
+    <task id="LOCAL-00009" summary="修改端口">
+      <option name="closed" value="true" />
+      <created>1772782425296</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1772782425296</updated>
+    </task>
+    <option name="localTasksCounter" value="10" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">

+ 6 - 4
Jenkinsfile

@@ -84,10 +84,10 @@ pipeline {
                         docker login -u ${aliUsername} -p ${aliPassword} ${DOCKER_LOGIN_REGISTRY}
                         """
 
-                        echo "删除镜像"
-                        sshCommand remote: remote, command: """
-                        docker rmi ${DOCKER_IMG_NAME}:latest || true
-                        """
+//                        echo "删除镜像"
+//                        sshCommand remote: remote, command: """
+//                        docker rmi ${DOCKER_IMG_NAME}:latest || true
+//                        """
 
                         echo "拉取镜像"
                         sshCommand remote: remote, command: """
@@ -110,6 +110,8 @@ services:
         condition: on-failure
     environment:
       - "TZ=Asia/Shanghai"
+    env_file:
+      - /docker/sp/storleadwebsite.env
     ports:
       - "${API_PORT}:3000"
     networks: