Skip to content

Commit c4200c5

Browse files
legoktmeloquence
authored andcommitted
Migrate to Debian bookworm
* Install poetry from Debian packages * Build deployment content in a Debian container instead of Python. This shouldn't make much of a difference except that we'll also get security updates of Python itself from Debian instead of needing to bump the image (which we haven't really been doing). * Bump the nginx alpine image to latest. * Update dependencies. Refs #567.
1 parent 7fcd6d3 commit c4200c5

File tree

5 files changed

+266
-90
lines changed

5 files changed

+266
-90
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@ jobs:
88
runs-on: ubuntu-latest
99
# We use a standard Debian image to mirror a typical developer environment.
1010
# This should be updated whenever a new Debian stable version is available.
11-
container: debian:bullseye
11+
container: debian:bookworm
1212
steps:
1313
- uses: actions/checkout@v4
1414
- name: Install dependencies
1515
run: |
16-
apt-get update && apt-get install --yes --no-install-recommends make python3-pip
17-
pip install poetry==1.4.0
16+
apt-get update && apt-get install --yes --no-install-recommends make python3-poetry
1817
poetry install --no-ansi
1918
- name: Run lint
2019
run: |

.github/workflows/linkcheck.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,12 @@ jobs:
1111
runs-on: ubuntu-latest
1212
# We use a standard Debian image to mirror a typical developer environment.
1313
# This should be updated whenever a new Debian stable version is available.
14-
container: debian:bullseye
14+
container: debian:bookworm
1515
steps:
1616
- uses: actions/checkout@v4
1717
- name: Install dependencies
1818
run: |
19-
apt-get update && apt-get install --yes --no-install-recommends make python3-pip
20-
pip install poetry==1.4.0
19+
apt-get update && apt-get install --yes --no-install-recommends make python3-poetry
2120
poetry install --no-ansi
2221
- name: Run lint
2322
run: |

deploy/Dockerfile

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
1-
# sha256 as of 2023-10-16
2-
FROM python:3.9-slim-bullseye@sha256:b3415be51b8d2c8f35a6eb3db85e9ccdedf12beaa3b18ed4c2f769889717d02a AS sphinx
1+
FROM debian:bookworm AS sphinx
32

43
ARG GIT_BRANCH=main
5-
RUN apt-get -q update && apt-get -qy upgrade && apt-get -qy install git make latexmk texlive-latex-extra
4+
RUN apt-get -q update && apt-get -qy upgrade && apt-get -qy install git make latexmk texlive-latex-extra python3-poetry
65
COPY ./ .
7-
RUN pip install poetry==1.4.0
86
RUN poetry install
9-
# TODO: Once the latest stable tag uses poetry, we can drop the `poetry run` prefix
10-
RUN poetry run deploy/build $GIT_BRANCH
7+
RUN deploy/build $GIT_BRANCH
118

12-
# sha256 as of 2023-10-16
13-
FROM nginx:mainline-alpine-slim@sha256:1b0cb433e90260a96528c987ee78b797e842d510473935304a0931536d10f50d
9+
# sha256 as of 2024-06-10
10+
FROM nginx:mainline-alpine-slim@sha256:244d37691a469d45349d9f29e8b7462d9f510b70c0c93acc5d23ee227070c962
1411

1512
COPY deploy/nginx.conf /etc/nginx
1613
RUN mkdir -p /opt/nginx/run /opt/nginx/webroot/en/latest /opt/nginx/webroot/en/stable && chown -R nginx:nginx /opt/nginx

0 commit comments

Comments
 (0)