Skip to content

Commit 2bb62de

Browse files
mattmakaimattmakai
committed
adding deployment diagram to source control page
1 parent 8ddba00 commit 2bb62de

File tree

9 files changed

+65
-15
lines changed

9 files changed

+65
-15
lines changed

‎change-log.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ <h1>Change Log</h1>
4646
<h2>2014</h2>
4747
<h3>June</h3>
4848
<ul>
49+
<li>Added diagram to source control page.</li>
4950
<li>Split version control resources from Git resources. Added new version
5051
control resources.</li>
5152
<li>Updated logging page with better explanations and content ordering.</li>

‎feeds/all.atom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-06-06T07:13:38Z</updated></feed>
2+
<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2014-06-06T07:25:03Z</updated></feed>

‎source-control.html‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,14 @@ <h2>Why is source control necessary?</h2>
5151
a necessity regardless of time size or the programming ecosystem used. Every
5252
project should immediately begin by using a version control system such
5353
as Git or Mercurial.</p>
54+
<p><img src="theme/img/app-source-control.png" width="100%" class="technical-diagram" alt="App deployment uses a server to pull from the source control system."></p>
55+
<p>Pulling code during a deployment is One way source control systems can fit
56+
into the deployment process. </p>
57+
<p>Note that some developers recommend deployment pipelines package the source
58+
code to deploy it and never have a production environment touch a source
59+
control system directly. However, for small scale deployments it's often
60+
easiest to pull from source code when you're getting started instead of
61+
figuring out how to wrap the Python code in a system installation package.</p>
5462
<h2>Source control systems</h2>
5563
<ul>
5664
<li>

‎source/content/pages/03-deployment/0313-source-control.markdown‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,17 @@ a necessity regardless of time size or the programming ecosystem used. Every
3232
project should immediately begin by using a version control system such
3333
as Git or Mercurial.
3434

35+
<img src="theme/img/app-source-control.png" width="100%" class="technical-diagram" alt="App deployment uses a server to pull from the source control system.">
36+
37+
Pulling code during a deployment is One way source control systems can fit
38+
into the deployment process.
39+
40+
Note that some developers recommend deployment pipelines package the source
41+
code to deploy it and never have a production environment touch a source
42+
control system directly. However, for small scale deployments it's often
43+
easiest to pull from source code when you're getting started instead of
44+
figuring out how to wrap the Python code in a system installation package.
45+
3546

3647
## Source control systems
3748
* [Git](http://git-scm.com/) is a free and open source distributed version

‎source/content/pages/10-misc/1005-change-log.markdown‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ the
2424

2525
## 2014
2626
### June
27+
* Added diagram to source control page.
2728
* Split version control resources from Git resources. Added new version
2829
control resources.
2930
* Updated logging page with better explanations and content ordering.

‎source/mockups/app-source-control.bmml‎

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,78 @@
1-
<mockup version="1.0" skin="sketch" fontFace="Balsamiq Sans" measuredW="1089" measuredH="613" mockupW="1062" mockupH="591">
1+
<mockup version="1.0" skin="sketch" fontFace="Balsamiq Sans" measuredW="1089" measuredH="613" mockupW="1077" mockupH="591">
22
<controls>
3-
<control controlID="3" controlTypeID="com.balsamiq.mockups::TextArea" x="410" y="145" w="250" h="143" measuredW="200" measuredH="140" zOrder="2" locked="false" isInGroup="-1">
3+
<control controlID="3" controlTypeID="com.balsamiq.mockups::TextArea" x="410" y="145" w="250" h="143" measuredW="200" measuredH="140" zOrder="3" locked="false" isInGroup="-1">
44
<controlProperties>
55
<align>center</align>
66
<size>28</size>
77
<text>%20%0AWSGI%20Server%20/%20%0AGateway</text>
88
</controlProperties>
99
</control>
10-
<control controlID="7" controlTypeID="com.balsamiq.mockups::Arrow" x="487" y="286" w="74" h="57" measuredW="150" measuredH="100" zOrder="5" locked="false" isInGroup="-1">
10+
<control controlID="7" controlTypeID="com.balsamiq.mockups::Arrow" x="487" y="286" w="74" h="57" measuredW="150" measuredH="100" zOrder="6" locked="false" isInGroup="-1">
1111
<controlProperties>
1212
<direction>bottom</direction>
1313
<leftArrow>true</leftArrow>
1414
<rightArrow>false</rightArrow>
1515
<text>Invokes</text>
1616
</controlProperties>
1717
</control>
18-
<control controlID="9" controlTypeID="com.balsamiq.mockups::Canvas" x="367" y="22" w="722" h="591" measuredW="100" measuredH="70" zOrder="0" locked="false" isInGroup="-1"/>
19-
<control controlID="10" controlTypeID="com.balsamiq.mockups::SubTitle" x="382" y="37" w="-1" h="-1" measuredW="75" measuredH="27" zOrder="6" locked="false" isInGroup="-1">
18+
<control controlID="9" controlTypeID="com.balsamiq.mockups::Canvas" x="367" y="22" w="722" h="591" measuredW="100" measuredH="70" zOrder="1" locked="false" isInGroup="-1"/>
19+
<control controlID="10" controlTypeID="com.balsamiq.mockups::SubTitle" x="382" y="37" w="-1" h="-1" measuredW="75" measuredH="27" zOrder="7" locked="false" isInGroup="-1">
2020
<controlProperties>
2121
<text>Server</text>
2222
</controlProperties>
2323
</control>
24-
<control controlID="11" controlTypeID="com.balsamiq.mockups::Canvas" x="382" y="79" w="693" h="512" measuredW="100" measuredH="70" zOrder="1" locked="false" isInGroup="-1"/>
25-
<control controlID="12" controlTypeID="com.balsamiq.mockups::SubTitle" x="397" y="94" w="-1" h="-1" measuredW="58" measuredH="27" zOrder="7" locked="false" isInGroup="-1">
24+
<control controlID="11" controlTypeID="com.balsamiq.mockups::Canvas" x="382" y="79" w="693" h="512" measuredW="100" measuredH="70" zOrder="2" locked="false" isInGroup="-1"/>
25+
<control controlID="12" controlTypeID="com.balsamiq.mockups::SubTitle" x="397" y="94" w="-1" h="-1" measuredW="58" measuredH="27" zOrder="8" locked="false" isInGroup="-1">
2626
<controlProperties>
2727
<text>Linux</text>
2828
</controlProperties>
2929
</control>
30-
<control controlID="13" controlTypeID="com.balsamiq.mockups::TextArea" x="777" y="136" w="269" h="106" measuredW="200" measuredH="140" zOrder="8" locked="false" isInGroup="-1">
30+
<control controlID="13" controlTypeID="com.balsamiq.mockups::TextArea" x="777" y="136" w="269" h="106" measuredW="200" measuredH="140" zOrder="9" locked="false" isInGroup="-1">
3131
<controlProperties>
3232
<align>center</align>
3333
<size>28</size>
3434
<text>%20%0AWeb%20Server</text>
3535
</controlProperties>
3636
</control>
37-
<control controlID="14" controlTypeID="com.balsamiq.mockups::Arrow" x="660" y="153" w="116" h="45" measuredW="150" measuredH="100" zOrder="9" locked="false" isInGroup="-1">
37+
<control controlID="14" controlTypeID="com.balsamiq.mockups::Arrow" x="660" y="153" w="116" h="45" measuredW="150" measuredH="100" zOrder="10" locked="false" isInGroup="-1">
3838
<controlProperties>
3939
<direction>bottom</direction>
4040
<rightArrow>false</rightArrow>
4141
<text>Pass%20requests</text>
4242
</controlProperties>
4343
</control>
44-
<control controlID="18" controlTypeID="com.balsamiq.mockups::TextArea" x="410" y="343" w="278" h="215" measuredW="200" measuredH="140" zOrder="3" locked="false" isInGroup="-1">
44+
<control controlID="18" controlTypeID="com.balsamiq.mockups::TextArea" x="410" y="343" w="278" h="215" measuredW="200" measuredH="140" zOrder="4" locked="false" isInGroup="-1">
4545
<controlProperties>
4646
<align>center</align>
4747
<size>28</size>
4848
<text>%20%0A%20%0AWSGI%20Application%20/%20%0AFramework</text>
4949
</controlProperties>
5050
</control>
51-
<control controlID="19" controlTypeID="com.balsamiq.mockups::TextArea" x="410" y="343" w="159" h="38" measuredW="200" measuredH="140" zOrder="4" locked="false" isInGroup="-1">
51+
<control controlID="19" controlTypeID="com.balsamiq.mockups::TextArea" x="410" y="343" w="159" h="38" measuredW="200" measuredH="140" zOrder="5" locked="false" isInGroup="-1">
5252
<controlProperties>
5353
<size>20</size>
5454
<text>%20Callable%20object</text>
5555
</controlProperties>
5656
</control>
57-
<control controlID="23" controlTypeID="com.balsamiq.mockups::RoundButton" x="27" y="275" w="259" h="163" measuredW="32" measuredH="32" zOrder="10" locked="false" isInGroup="-1">
57+
<control controlID="23" controlTypeID="com.balsamiq.mockups::RoundButton" x="27" y="275" w="259" h="163" measuredW="32" measuredH="32" zOrder="11" locked="false" isInGroup="-1">
5858
<controlProperties>
5959
<shape>dottedRect</shape>
6060
<text>Source%20control</text>
6161
</controlProperties>
6262
</control>
63-
<control controlID="24" controlTypeID="com.balsamiq.mockups::Arrow" x="288" y="390" w="122" h="58" measuredW="150" measuredH="100" zOrder="11" locked="false" isInGroup="-1">
63+
<control controlID="24" controlTypeID="com.balsamiq.mockups::Arrow" x="288" y="390" w="122" h="58" measuredW="150" measuredH="100" zOrder="12" locked="false" isInGroup="-1">
6464
<controlProperties>
6565
<leftArrow>true</leftArrow>
66-
<rightArrow>false</rightArrow>
66+
<rightArrow>true</rightArrow>
6767
<text>pulls%20code</text>
6868
</controlProperties>
6969
</control>
70+
<control controlID="25" controlTypeID="com.balsamiq.mockups::Canvas" x="12" y="22" w="305" h="591" measuredW="100" measuredH="70" zOrder="0" locked="false" isInGroup="-1"/>
71+
<control controlID="26" controlTypeID="com.balsamiq.mockups::TextArea" x="29" y="38" w="257" h="183" measuredW="200" measuredH="140" zOrder="13" locked="false" isInGroup="-1">
72+
<controlProperties>
73+
<size>20</size>
74+
<text>This%20could%20be%20an%20externally%20hosted%20source%20control%20system%20such%20as%20GitHub%20or%20BitBucket.%20It%20could%20also%20be%20your%20own%20server%20where%20you%20securely%20host%20the%20Git%20repository.</text>
75+
</controlProperties>
76+
</control>
7077
</controls>
7178
</mockup>

‎source/mockups/full-stack-python-map.bmml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,5 +420,27 @@
420420
</control>
421421
</groupChildrenDescriptors>
422422
</control>
423+
<control controlID="75" controlTypeID="__group__" x="426" y="502" w="259" h="54" measuredW="259" measuredH="54" zOrder="41" locked="false" isInGroup="-1">
424+
<groupChildrenDescriptors>
425+
<control controlID="0" controlTypeID="com.balsamiq.mockups::RoundButton" x="0" y="0" w="259" h="54" measuredW="32" measuredH="32" zOrder="0" locked="false" isInGroup="75">
426+
<controlProperties>
427+
<shape>dottedRect</shape>
428+
<size>32</size>
429+
<text/>
430+
<underline>true</underline>
431+
</controlProperties>
432+
</control>
433+
<control controlID="1" controlTypeID="com.balsamiq.mockups::Label" x="22" y="7" w="-1" h="-1" measuredW="210" measuredH="40" zOrder="1" locked="false" isInGroup="75">
434+
<controlProperties>
435+
<color>10027263</color>
436+
<href>http%3A//www.fullstackpython.com/source-control.html</href>
437+
<map>%3Carea%20shape%3D%22rect%22%20coords%3D%22422%2C501%2C632%2C541%22%20href%3D%22http%3A//www.fullstackpython.com/source-control.html%22%20alt%3D%22http%3A//www.fullstackpython.com/source-control.html%22%20id%3D%221%22%20target%3D%22_blank%22/%3E</map>
438+
<size>32</size>
439+
<text>Source%20control</text>
440+
<underline>true</underline>
441+
</controlProperties>
442+
</control>
443+
</groupChildrenDescriptors>
444+
</control>
423445
</controls>
424446
</mockup>

‎source/theme/static/img/app-source-control.png‎

64 KB
Loading

‎theme/img/app-source-control.png‎

64 KB
Loading

0 commit comments

Comments
 (0)