diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 5bd037e66c71a6baa21feac768315f57f4d78482..9ccaa9df32ad531dad582d0d7e749f36a152ed5c 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -25,6 +25,8 @@ 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 + `2.5`_ – 2022-01-02 ------------------- 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 \