diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 6549852db772e0173310c8dbcf9a3d8525147171..5ff4a75ef2d527ed52b454faaa0f4bbadbfc6064 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -35,6 +35,7 @@ Changed * Name collisions are resolved by prefixing with the app label * Apps can extend SHELL_PLUS_APP_PREFIXES and SHELL_PLUS_DONT_LOAD +* [Docker] Base image now contains curl, grep, less, sed, and pspg * Views raising a 404 error can now customise the message that is displayed on the error page * OpenID Connect is enabled by default now, without RSA support diff --git a/Dockerfile b/Dockerfile index b8893aa39b2075dc5a17d6da49b365bd3e91a9d8..acb08f98ffe79dccc32f048590bb123c2763302f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,6 +19,7 @@ ENV ALEKSIS_static__root /usr/share/aleksis/static ENV ALEKSIS_media__root /var/lib/aleksis/media ENV ALEKSIS_backup__location /var/lib/aleksis/backups ENV ALEKSIS_dev__uwsgi__celery false +ENV PSQL_PAGER=pspg # Install necessary Debian and PyPI packages for build and runtime RUN apt-get -y update && \ @@ -28,11 +29,15 @@ RUN apt-get -y update && \ eatmydata apt-get install -y --no-install-recommends \ build-essential \ chromium \ + curl \ dumb-init \ gettext \ + grep \ + less \ libpq-dev \ libssl-dev \ postgresql-client-14 \ + pspg \ python3-dev \ python3-magic \ python3-pip \