Skip to content

Commit 11ca2bb

Browse files
committed
Update dependencies and fix website build
1 parent 3a6cb10 commit 11ca2bb

6 files changed

+95
-86
lines changed

Dockerfile

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# build container
22
FROM python:3-alpine as builder
33

4-
RUN apk add --no-cache gcc musl-dev libffi-dev rust cargo openssl-dev
4+
RUN apk add --no-cache gcc musl-dev libffi-dev rust cargo openssl-dev poetry
55

66
# build as a regular user, not root, to avoid annoying warnings from pip
77
RUN adduser -S build
@@ -11,16 +11,15 @@ WORKDIR /build
1111

1212
COPY pyproject.toml /build/
1313
COPY poetry.lock /build/
14-
RUN pip install -U pip && \
15-
pip install poetry && \
16-
python3 -m poetry install
14+
15+
RUN poetry install
1716

1817
COPY --chown=build:nobody locale/ /build/locale/
1918
COPY --chown=build:nobody www/ /build/www/
2019
COPY *.py /build/
2120
COPY *.jinja2 /build/
2221

23-
RUN python3 -m poetry run python translator.py --compile --render
22+
RUN poetry run python translator.py --compile --render
2423

2524

2625
# deployment container

babel.cfg

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
[jinja2: *.jinja2]
22
encoding = utf-8
33
line_statement_prefix = %
4-
extensions=jinja2.ext.autoescape,jinja2.ext.with_

docker-compose.yml.example

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: '2'
2-
31
services:
42
web:
53
build: .

poetry.lock

+87-72
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
[tool.poetry]
22
name = "appimage-website"
3-
version = "0.0.1"
43
description = "Source for appimage.org"
54
authors = ["AppImage Team"]
65
license = "Apache 2.0"
6+
package-mode = false
77

88
[tool.poetry.dependencies]
9-
python = "^3.6"
10-
Jinja2 = "^3.0.1"
9+
python = "^3.12"
10+
Jinja2 = "^3"
1111
Babel = "^2.9.1"
1212

13-
[tool.poetry.dev-dependencies]
13+
[poetry.group.dev.dependencies]
1414

1515
[build-system]
1616
requires = ["poetry-core>=1.0.0"]

translator.py

-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ def render_pages():
2525
loader=jinja2.FileSystemLoader(this_dir),
2626
extensions=[
2727
"jinja2.ext.i18n",
28-
"jinja2.ext.autoescape",
29-
"jinja2.ext.with_"
3028
],
3129
)
3230

0 commit comments

Comments
 (0)