From 60b4339f33b1dc2bba38b84d1fcb49ba1896535c Mon Sep 17 00:00:00 2001
From: ToBeADevOps <70322265+ToBeADevOps@users.noreply.github.com>
Date: Wed, 9 Sep 2020 16:54:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E6=AC=A1=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96=E6=89=93=E5=8C=85=E9=83=A8=E7=BD=B2=5F012=20=E5=B0=86?=
 =?UTF-8?q?run.sh=EF=BC=8C=E5=8D=B3=E8=BF=90=E8=A1=8C=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=99=A8=E7=9A=84=E6=8C=87=E4=BB=A4=EF=BC=8C=E6=94=BE=E5=85=A5?=
 =?UTF-8?q?=E5=8C=85=E4=B8=AD=EF=BC=8C=E5=BE=85=E8=A7=A3=E5=8E=8B=E5=90=8E?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87CMD=E5=91=BD=E4=BB=A4=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml | 109 ++++++++++++++++++++++++++++++--------------
 Dockerfile          |   5 +-
 MANIFEST.in         |   1 +
 run.sh              |   2 +
 4 files changed, 81 insertions(+), 36 deletions(-)
 create mode 100644 run.sh

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 818fff5..17a40e6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="b607d0ec-6b80-4527-85ad-7c1c544feb41" name="Default Changelist" comment="第一次自动化打包部署_009&#10;环境依赖文件需要在开发环境下准备">
+    <list default="true" id="b607d0ec-6b80-4527-85ad-7c1c544feb41" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/run.sh" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/Package.sh" beforeDir="false" afterPath="$PROJECT_DIR$/Package.sh" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Dockerfile" beforeDir="false" afterPath="$PROJECT_DIR$/Dockerfile" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/MANIFEST.in" beforeDir="false" afterPath="$PROJECT_DIR$/MANIFEST.in" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -25,20 +27,20 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Jenkinsfile">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="297">
+            <state relative-caret-position="864">
               <caret line="32" column="13" lean-forward="true" selection-start-line="32" selection-start-column="13" selection-end-line="32" selection-end-column="13" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/MANIFEST.in">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="135">
-              <caret line="5" column="30" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+            <state relative-caret-position="81">
+              <caret line="3" column="14" selection-start-line="3" selection-start-column="14" selection-end-line="3" selection-end-column="14" />
             </state>
           </provider>
         </entry>
@@ -46,8 +48,17 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Dockerfile">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="189">
-              <caret line="7" column="35" selection-start-line="7" selection-start-column="35" selection-end-line="7" selection-end-column="35" />
+            <state relative-caret-position="216">
+              <caret line="8" column="35" lean-forward="true" selection-start-line="8" selection-start-column="35" selection-end-line="8" selection-end-column="35" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/run.sh">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="27">
+              <caret line="1" column="26" selection-start-line="1" selection-start-column="26" selection-end-line="1" selection-end-column="26" />
             </state>
           </provider>
         </entry>
@@ -55,8 +66,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Package.sh">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="243">
-              <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+            <state relative-caret-position="54">
+              <caret line="2" column="14" lean-forward="true" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="14" />
             </state>
           </provider>
         </entry>
@@ -119,10 +130,11 @@
         <option value="$PROJECT_DIR$/Poetry_AE/settings.py" />
         <option value="$PROJECT_DIR$/setup.py" />
         <option value="$PROJECT_DIR$/setup.cfg" />
-        <option value="$PROJECT_DIR$/MANIFEST.in" />
         <option value="$PROJECT_DIR$/Jenkinsfile" />
-        <option value="$PROJECT_DIR$/Dockerfile" />
         <option value="$PROJECT_DIR$/Package.sh" />
+        <option value="$PROJECT_DIR$/Dockerfile" />
+        <option value="$PROJECT_DIR$/run.sh" />
+        <option value="$PROJECT_DIR$/MANIFEST.in" />
       </list>
     </option>
   </component>
@@ -256,7 +268,7 @@
       <workItem from="1599544205353" duration="2756000" />
       <workItem from="1599616376904" duration="1163000" />
       <workItem from="1599633655657" duration="4243000" />
-      <workItem from="1599638342388" duration="2186000" />
+      <workItem from="1599638342388" duration="3235000" />
     </task>
     <task id="LOCAL-00001" summary="Merge remote-tracking branch 'origin/master' into master&#10;&#10;# Conflicts:&#10;#&#9;Jenkinsfile">
       <created>1599480767017</created>
@@ -496,17 +508,38 @@
       <option name="project" value="LOCAL" />
       <updated>1599640245937</updated>
     </task>
-    <option name="localTasksCounter" value="35" />
+    <task id="LOCAL-00035" summary="第一次自动化打包部署_009&#10;环境依赖文件需要在开发环境下准备">
+      <created>1599640538859</created>
+      <option name="number" value="00035" />
+      <option name="presentableId" value="LOCAL-00035" />
+      <option name="project" value="LOCAL" />
+      <updated>1599640538859</updated>
+    </task>
+    <task id="LOCAL-00036" summary="第一次自动化打包部署_010&#10;解压包之后会在文件夹中产生文件">
+      <created>1599640691247</created>
+      <option name="number" value="00036" />
+      <option name="presentableId" value="LOCAL-00036" />
+      <option name="project" value="LOCAL" />
+      <updated>1599640691247</updated>
+    </task>
+    <task id="LOCAL-00037" summary="第一次自动化打包部署_011&#10;没有正常部署运行，尝试将命令放在RUN中">
+      <created>1599641033236</created>
+      <option name="number" value="00037" />
+      <option name="presentableId" value="LOCAL-00037" />
+      <option name="project" value="LOCAL" />
+      <updated>1599641033236</updated>
+    </task>
+    <option name="localTasksCounter" value="38" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="37082000" />
+    <option name="totallyTimeSpent" value="38131000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="1433" y="548" width="2062" height="1136" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" sideWeight="0.49900398" visible="true" weight="0.17814371" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49900398" visible="true" weight="0.17814371" />
       <window_info id="Structure" order="1" sideWeight="0.500996" side_tool="true" weight="0.16916168" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
@@ -520,7 +553,7 @@
       <window_info anchor="bottom" id="Version Control" order="8" sideWeight="0.499501" weight="0.32968128" />
       <window_info anchor="bottom" id="Database Changes" order="9" />
       <window_info anchor="bottom" id="Event Log" order="10" sideWeight="0.50798404" side_tool="true" weight="0.32968128" />
-      <window_info active="true" anchor="bottom" id="Terminal" order="11" sideWeight="0.49201596" visible="true" weight="0.32968128" />
+      <window_info anchor="bottom" id="Terminal" order="11" sideWeight="0.49201596" visible="true" weight="0.32968128" />
       <window_info anchor="bottom" id="Python Console" order="12" weight="0.32968128" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
@@ -557,7 +590,10 @@
     <MESSAGE value="第一次自动化打包部署_006&#10;docker bulid 仓库名称必须小写" />
     <MESSAGE value="第一次自动化打包部署_007&#10;未指定工作目录导致docker build失败，同时尚未添加删除前一容器的指令。" />
     <MESSAGE value="第一次自动化打包部署_008&#10;COPY指令的目标目录少加了一个/" />
-    <option name="LAST_COMMIT_MESSAGE" value="第一次自动化打包部署_008&#10;COPY指令的目标目录少加了一个/" />
+    <MESSAGE value="第一次自动化打包部署_009&#10;环境依赖文件需要在开发环境下准备" />
+    <MESSAGE value="第一次自动化打包部署_010&#10;解压包之后会在文件夹中产生文件" />
+    <MESSAGE value="第一次自动化打包部署_011&#10;没有正常部署运行，尝试将命令放在RUN中" />
+    <option name="LAST_COMMIT_MESSAGE" value="第一次自动化打包部署_011&#10;没有正常部署运行，尝试将命令放在RUN中" />
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python38-32/Lib/threading.py">
@@ -642,38 +678,45 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/setup.py">
+    <entry file="file://$PROJECT_DIR$/Package.sh">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="54">
-          <caret line="2" column="7" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
+          <caret line="2" column="14" lean-forward="true" selection-start-line="2" selection-start-column="14" selection-end-line="2" selection-end-column="14" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Dockerfile">
+    <entry file="file://$PROJECT_DIR$/Jenkinsfile">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="189">
-          <caret line="7" column="35" selection-start-line="7" selection-start-column="35" selection-end-line="7" selection-end-column="35" />
+        <state relative-caret-position="864">
+          <caret line="32" column="13" lean-forward="true" selection-start-line="32" selection-start-column="13" selection-end-line="32" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/MANIFEST.in">
+    <entry file="file://$PROJECT_DIR$/setup.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="54">
+          <caret line="2" column="7" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Dockerfile">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="5" column="30" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
+        <state relative-caret-position="216">
+          <caret line="8" column="35" lean-forward="true" selection-start-line="8" selection-start-column="35" selection-end-line="8" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Package.sh">
+    <entry file="file://$PROJECT_DIR$/run.sh">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="243">
-          <caret line="9" lean-forward="true" selection-start-line="9" selection-end-line="9" />
+        <state relative-caret-position="27">
+          <caret line="1" column="26" selection-start-line="1" selection-start-column="26" selection-end-line="1" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Jenkinsfile">
+    <entry file="file://$PROJECT_DIR$/MANIFEST.in">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="297">
-          <caret line="32" column="13" lean-forward="true" selection-start-line="32" selection-start-column="13" selection-end-line="32" selection-end-column="13" />
+        <state relative-caret-position="81">
+          <caret line="3" column="14" selection-start-line="3" selection-start-column="14" selection-end-line="3" selection-end-column="14" />
         </state>
       </provider>
     </entry>
diff --git a/Dockerfile b/Dockerfile
index a767e2c..0511386 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,6 @@ WORKDIR /usr/src/app
 
 RUN tar zxvf django-PACP-0.1.tar.gz && \
     cd django-PACP-0.1 && \
-    pip install -r requirements.txt && \
-    python manage.py runserver
+    pip install -r requirements.txt
 
-CMD ["python", "manage.py", "runserver"]
\ No newline at end of file
+CMD ["sh", "run.sh"]
\ No newline at end of file
diff --git a/MANIFEST.in b/MANIFEST.in
index d639824..b9861db 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,6 +1,7 @@
 include LICENSE
 include README.md
 include manage.py
+include run.sh
 include requirements.txt
 recursive-include static *
 recursive-include templadtes *
\ No newline at end of file
diff --git a/run.sh b/run.sh
new file mode 100644
index 0000000..d508cfc
--- /dev/null
+++ b/run.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+python manage.py runserver
\ No newline at end of file
-- 
GitLab