CCCHH/hedgedoc-expire
0
0
Fork 1
Code Issues Pull requests 1 Projects Releases Packages 1 Wiki Activity Actions

make docker image build work

Browse source 
- Depend on a python version Debian actually ships with in
  pyproject.toml and update the poetry.lock accordingly.
- Fix poetry bundle complaining about no python by installing
  python-is-python3.
  Also remove the python flag for poetry bundle then.
This commit is contained in:
Julian Schacher 2024-11-25 16:35:16 +01:00
parent 4abb4d7516
commit 86e03c0d4e
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Dockerfile
View file

@ -1,12 +1,12 @@
FROM docker.io/library/debian:12-slim AS builder FROM docker.io/library/debian:12-slim AS builder
RUN apt-get update && \ RUN apt-get update && \
apt-get install --no-install-suggests --no-install-recommends --yes pipx apt-get install --no-install-suggests --no-install-recommends --yes pipx python-is-python3
ENV PATH="/root/.local/bin:${PATH}" ENV PATH="/root/.local/bin:${PATH}"
RUN pipx install poetry RUN pipx install poetry
RUN pipx inject poetry poetry-plugin-bundle RUN pipx inject poetry poetry-plugin-bundle
WORKDIR /src WORKDIR /src
COPY . . COPY . .
RUN poetry bundle venv --python=/usr/bin/python3 --only=main /venv RUN poetry bundle venv --only=main /venv
FROM gcr.io/distroless/python3-debian12 FROM gcr.io/distroless/python3-debian12
COPY --from=builder /venv /venv COPY --from=builder /venv /venv

6
poetry.lock generated
View file

@ -1,4 +1,4 @@
# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. # This file is automatically @generated by Poetry 1.8.4 and should not be changed by hand.
[[package]] [[package]]
name = "humanize" name = "humanize"
@ -26,5 +26,5 @@ files = [
[metadata] [metadata]
lock-version = "2.0" lock-version = "2.0"
python-versions = "^3.12" python-versions = "^3.11"
content-hash = "0b022231d09549e564a7cec69a9169cbd5a27e550b5a10a8b57ef2bbe251b6fe" content-hash = "bc794458508ceedfc18e9635ad18b7113d5118c414698ebc12762c782ed3670d"

2
pyproject.toml
View file

@ -6,7 +6,7 @@ authors = ["Stefan Bethke <stb@lassitu.de>"]
readme = "README.md" readme = "README.md"
[tool.poetry.dependencies] [tool.poetry.dependencies]
python = "^3.12" python = "^3.11"
pgsql = "^2.2" pgsql = "^2.2"
humanize = "^4.9.0" humanize = "^4.9.0"