Skip to content

Commit 4295c07

Browse files
mattmakaimattmakai
committed
adding new docker image section including issue mattmakai#79 
1 parent dbfff76 commit 4295c07

38 files changed

+91
-304
lines changed

‎all.html‎

Lines changed: 31 additions & 101 deletions
Large diffs are not rendered by default.

‎best-python-resources.html‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,7 @@ <h1>Best Python Resources</h1>
3737
out there though that it can be difficult to know how to find them. </p>
3838
<p>This page aggregates the best general Python resources with descriptions of
3939
what they provide to readers.</p>
40-
<div class="well see-also">
41-
If you prefer to learn by watching videos check out the
42-
<a href="/best-python-videos.html">best Python videos</a>. You may
43-
also be interested in reading about
44-
<a href="/development-environments.html">development environments</a>
45-
to use for coding.
46-
</div>
40+
<div class="well see-also">If you prefer to learn by watching videos check out the <a href="/best-python-videos.html">best Python videos</a>. You may also be interested in reading about <a href="/development-environments.html">development environments</a> to use for coding.</div>
4741

4842
<h2>New to programming</h2>
4943
<p>If you're learning your first programming language these books were written

‎best-python-videos.html‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,7 @@ <h1>Best Python Videos</h1>
3939
<p>This page links to the best free videos as well as other video lists so you
4040
can do your own searching through the huge backlog of conference and meetup
4141
talks from the past several years. </p>
42-
<div class="well see-also">
43-
Be sure to read the
44-
<a href="/best-python-resources.html">best Python resources</a> for
45-
links to books and articles as well as
46-
<a href="/web-frameworks.html">web frameworks</a>
47-
to learn more about web development.
48-
</div>
42+
<div class="well see-also">Be sure to read the <a href="/best-python-resources.html">best Python resources</a> for links to books and articles as well as <a href="/web-frameworks.html">web frameworks</a> to learn more about web development.</div>
4943

5044
<h2>Live Coding</h2>
5145
<p>Learn by watching developers code. Follow my account on

‎change-log.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ <h1>Change Log</h1>
3939
<h2>2016</h2>
4040
<h3>February</h3>
4141
<ul>
42+
<li>Added a new section for <a href="/docker.html">Python images within Docker containers</a>.</li>
4243
<li>Added a couple of new resources to the <a href="/websockets.html">WebSockets</a> page.</li>
4344
</ul>
4445
<h3>January</h3>

‎databases.html‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,7 @@ <h2>Why are databases necessary?</h2>
4444
mental framework for how the data should be saved and retrieved instead of
4545
having to figure out what to do with the data every time you build a new
4646
application.</p>
47-
<div class="well see-also">
48-
Databases are a concept with many implementations,
49-
including <a href="/postgresql.html">PostgreSQL</a>,
50-
<a href="/mysql.html">MySQL</a> and
51-
<a href="/sqlite.html">SQLite</a>. Non-relational databases
52-
called <a href="/no-sql-datastore.html">NoSQL data stores</a> also exist.
53-
Learn more in the <a href="/data.html">data</a> chapter or view the
54-
<a href="/table-of-contents.html">table of contents</a> for all topics.
55-
</div>
47+
<div class="well see-also">Databases are a concept with many implementations, including <a href="/postgresql.html">PostgreSQL</a>, <a href="/mysql.html">MySQL</a> and <a href="/sqlite.html">SQLite</a>. Non-relational databases called <a href="/no-sql-datastore.html">NoSQL data stores</a> also exist. Learn more in the <a href="/data.html">data</a> chapter or view the <a href="/table-of-contents.html">table of contents</a> for all topics.</div>
5648

5749
<h2>Relational databases</h2>
5850
<p>The database storage abstraction most commonly used in Python web development

‎development-environments.html‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,7 @@ <h2>Why is a development environment necessary?</h2>
4444
applications. The text editor provides a way to write the code. The
4545
interpreter allows it to be executed. Testing to see if the code does what
4646
you want can either be done manually or by unit and functional tests. </p>
47-
<div class="well see-also">
48-
While you're learning about development environments be sure to
49-
check out information on <a href="/vim.html">Vim</a> and
50-
<a href="/emacs.html">Emacs</a>.
51-
</div>
47+
<div class="well see-also">While you're learning about development environments be sure to check out information on <a href="/vim.html">Vim</a> and <a href="/emacs.html">Emacs</a>.</div>
5248

5349
<h2>A development environment example</h2>
5450
<p>Here's what I (the author of Full Stack Python,

‎django.html‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,7 @@ <h2>Why is Django a good web framework choice?</h2>
7070
<a href="http://www.jeffknupp.com/blog/2012/12/11/learning-python-via-django-considered-harmful/">learning Python by using Django is a bad idea</a>.
7171
However, that criticism is invalid if you take the time to learn the Python
7272
syntax and language semantics first before diving into web development.</p>
73-
<div class="well see-also">
74-
While you're learning about Django you should also read up on
75-
<a href="/web-frameworks.html">web frameworks</a> and check out the
76-
<a href="/bottle.html">Bottle framework</a>.
77-
</div>
73+
<div class="well see-also">While you're learning about Django you should also read up on <a href="/web-frameworks.html">web frameworks</a> and check out the <a href="/bottle.html">Bottle framework</a>.</div>
7874

7975
<h2>Django books and tutorials</h2>
8076
<p>There are a slew of free or low cost resources out there for Django. Since
@@ -200,11 +196,8 @@ <h2>Django books and tutorials</h2>
200196
</li>
201197
</ul>
202198
<h2>Django videos</h2>
203-
<p><div class="well" style="margin-top: 20px;">
204-
Looking for Django videos instead of just articles? There's a special section
205-
for Django and web development on the
206-
<a href="/best-python-videos.html">Best Python Videos</a> page.
207-
</div></p>
199+
<p>Are you looking for Django videos in addition to articles? There is a special section
200+
for Django and web development on the <a href="/best-python-videos.html">best Python videos</a> page.</p>
208201
<h2>Django migrations</h2>
209202
<ul>
210203
<li>

‎docker.html‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,18 @@ <h2>Why is Docker important?</h2>
4242
has the potential to be the abstraction layer that easily manages containers
4343
running on top of any type of server, regardless of whether that server is
4444
on Amazon Web Services, Google Compute Engine, Linode, Rackspace or elsewhere.</p>
45+
<h2>Python projects within Docker images</h2>
46+
<ul>
47+
<li>
48+
<p>This Docker image contains
49+
<a href="https://github.com/tiangolo/uwsgi-nginx-flask-docker">a Flask application configured to run with uWSGI and Nginx</a>.
50+
You can also see the <a href="https://hub.docker.com/r/tiangolo/uwsgi-nginx-flask/">image on Docker hub</a>.</p>
51+
</li>
52+
<li>
53+
<p><a href="https://github.com/OrangeTux/minimal-docker-python-setup">minimal-docker-python-setup</a>
54+
contains an image with Nginx, uWSGI, Redis and Flask.</p>
55+
</li>
56+
</ul>
4557
<h2>Docker resources</h2>
4658
<ul>
4759
<li>

‎emacs.html‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,7 @@ <h2>Why is Emacs a good choice for Python coding?</h2>
4747
provide an extension mechanism for Emacs. For example,
4848
<code>kill-emacs-hook</code> runs before exiting Emacs so functions can be loaded
4949
into that hook to perform necessary actions before the exiting completes.</p>
50-
<div class="well see-also">
51-
While you're reading about coding Python in Vim be sure to also
52-
learn about which <a href="/web-frameworks.html">web frameworks</a> to
53-
use as well as
54-
<a href="/deployment.html">how to deploy an application</a>.
55-
</div>
50+
<div class="well see-also">While you're reading about coding Python in Vim be sure to also learn about which <a href="/web-frameworks.html">web frameworks</a> to use as well as <a href="/deployment.html">how to deploy an application</a>.</div>
5651

5752
<h2>General Emacs resources</h2>
5853
<ul>

‎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>2016-02-19T12:53:11Z</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>2016-02-20T14:22:26Z</updated></feed>

0 commit comments

Comments
 (0)