提交 60b4339f 编写于 作者: T ToBeADevOps

第一次自动化打包部署_012

将run.sh,即运行服务器的指令,放入包中,待解压后通过CMD命令执行。
上级 c1599ebc
<?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>
......
......@@ -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
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
#!/usr/bin/env bash
python manage.py runserver
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册