Skip to content

Commit

Permalink
Switch to python:3.10.6-slim-bullseye for datasette publish - refs #1768
Browse files Browse the repository at this point in the history
  • Loading branch information
simonw committed Aug 14, 2022
1 parent 668415d commit 080d4b3
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion datasette/utils/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ def make_dockerfile(
"SQLITE_EXTENSIONS"
] = "/usr/lib/x86_64-linux-gnu/mod_spatialite.so"
return """
FROM python:3.8
FROM python:3.10.6-slim-bullseye
COPY . /app
WORKDIR /app
{apt_get_extras}
Expand Down
2 changes: 1 addition & 1 deletion demos/apache-proxy/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.9.7-slim-bullseye
FROM python:3.10.6-slim-bullseye

RUN apt-get update && \
apt-get install -y apache2 supervisor && \
Expand Down
2 changes: 1 addition & 1 deletion docs/publish.rst
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ Here's example output for the package command::

$ datasette package parlgov.db --extra-options="--setting sql_time_limit_ms 2500"
Sending build context to Docker daemon 4.459MB
Step 1/7 : FROM python:3
Step 1/7 : FROM python:3.10.6-slim-bullseye
---> 79e1dc9af1c1
Step 2/7 : COPY . /app
---> Using cache
Expand Down
2 changes: 1 addition & 1 deletion tests/test_package.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def __call__(self, _):


EXPECTED_DOCKERFILE = """
FROM python:3.8
FROM python:3.10.6-slim-bullseye
COPY . /app
WORKDIR /app
Expand Down
4 changes: 2 additions & 2 deletions tests/test_publish_cloudrun.py
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ def test_publish_cloudrun_plugin_secrets(
)
expected = textwrap.dedent(
r"""
FROM python:3.8
FROM python:3.10.6-slim-bullseye
COPY . /app
WORKDIR /app
Expand Down Expand Up @@ -290,7 +290,7 @@ def test_publish_cloudrun_apt_get_install(
)
expected = textwrap.dedent(
r"""
FROM python:3.8
FROM python:3.10.6-slim-bullseye
COPY . /app
WORKDIR /app
Expand Down

0 comments on commit 080d4b3

Please sign in to comment.