diff --git a/errata.md b/errata.md index 11e10af..d910165 100644 --- a/errata.md +++ b/errata.md @@ -1,13 +1,19 @@ # Errata for *Book Title* -On **page xx** [Summary of error]: +On **page 6** [Figure captions interchanged]: -Details of error here. Highlight key pieces in **bold**. +On page 6 and page 7, the captions for **Figure 1-1 and Figure 1-2 are interchanged**. The caption for Figure 1-1 should read _Representation of three apps running on three different virtual machines_ and the caption for Figure 1-2 should read _Representation of three apps running on three different containers_. *** -On **page xx** [Summary of error]: +On **page 27** [Extra word on the sentence about inter-daemon communication]: -Details of error here. Highlight key pieces in **bold**. +On page 27, in the chapter paragraph about Docker daemon, the example sentence mentions _Some examples of inter-daemon communication include communication Datadog for container metrics monitoring and Aqua for container security monitoring_. This should **actually read** _Some examples of inter-daemon communication include Datadog for container metrics monitoring and Aqua for container security monitoring_ -*** \ No newline at end of file +*** + + +For the **Telegram chat bot exercises** [Docker image has been updated]: + +The exercises refer to Docker iamge to be used as `FROM python:3-alpine`. Due to some breaking changes in Python versions and dependencies, this causes **Docker image to not build**. +For this reason, the Docker images have been **updated** to refer to **Python 3.9** image and as a result, the FROM line has been updated to `FROM python:3.9-alpine` in place of the existing `FROM python:3-alpine`. diff --git a/source-code/chapter-3/python-app/.gitignore b/source-code/chapter-3/python-app/.gitignore new file mode 100644 index 0000000..ad7e159 --- /dev/null +++ b/source-code/chapter-3/python-app/.gitignore @@ -0,0 +1,59 @@ +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] + +# C extensions +*.so + +# Distribution / packaging +.Python +env/ +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +*.egg-info/ +.installed.cfg +*.egg + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*,cover + +# Translations +*.mo +*.pot + +# Django stuff: +*.log + +# Sphinx documentation +docs/_build/ + +# PyBuilder +target/ +.idea/ +last_updated.txt diff --git a/source-code/chapter-4/exercise-1/docker-hello-world/Dockerfile b/source-code/chapter-4/exercise-1/docker-hello-world/Dockerfile index 620cf40..3e3bd8b 100644 --- a/source-code/chapter-4/exercise-1/docker-hello-world/Dockerfile +++ b/source-code/chapter-4/exercise-1/docker-hello-world/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3-alpine +FROM python:3.9-alpine LABEL description="Dockerfile for Python script which prints Hello, Name" diff --git a/source-code/chapter-4/exercise-2/docker-multi-stage/multistage-build/Dockerfile b/source-code/chapter-4/exercise-2/docker-multi-stage/multistage-build/Dockerfile index 6f47e3a..ce215e1 100644 --- a/source-code/chapter-4/exercise-2/docker-multi-stage/multistage-build/Dockerfile +++ b/source-code/chapter-4/exercise-2/docker-multi-stage/multistage-build/Dockerfile @@ -2,7 +2,7 @@ FROM python:3 as python-base COPY requirements.txt . RUN pip install -r requirements.txt -FROM python:3-alpine +FROM python:3.9-alpine COPY --from=python-base /root/.cache /root/.cache COPY --from=python-base requirements.txt . RUN pip install -r requirements.txt && rm -rf /root/.cache diff --git a/source-code/chapter-4/exercise-3/newsbot/Dockerfile b/source-code/chapter-4/exercise-3/newsbot/Dockerfile index b0f0486..840b315 100644 --- a/source-code/chapter-4/exercise-3/newsbot/Dockerfile +++ b/source-code/chapter-4/exercise-3/newsbot/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3-alpine +FROM python:3.9-alpine WORKDIR /apps/subredditfetcher/ COPY . . RUN ["pip", "install", "-r", "requirements.txt"] diff --git a/source-code/chapter-6/exercise-1/newsbot/Dockerfile b/source-code/chapter-6/exercise-1/newsbot/Dockerfile index 7d69914..d335f14 100644 --- a/source-code/chapter-6/exercise-1/newsbot/Dockerfile +++ b/source-code/chapter-6/exercise-1/newsbot/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3-alpine +FROM python:3.9-alpine RUN apk add gcc musl-dev python3-dev libffi-dev openssl-dev cargo WORKDIR /apps/subredditfetcher/