diff --git a/docker/alpine.Dockerfile b/docker/alpine.Dockerfile index 3057f8ab8..51ad9a541 100644 --- a/docker/alpine.Dockerfile +++ b/docker/alpine.Dockerfile @@ -3,6 +3,7 @@ LABEL org.opencontainers.image.source=https://github.com/fish-shell/fish-shell ENV LANG=C.UTF-8 ENV LC_ALL=C.UTF-8 +ENV PIP_ROOT_USER_ACTION=ignore RUN apk add --no-cache \ bash \ @@ -14,11 +15,15 @@ RUN apk add --no-cache \ musl-dev \ pcre2-dev \ py3-pexpect \ + py3-pip \ python3 \ rust \ + rustfmt \ sudo \ tmux +RUN pip install --break-system-packages black + RUN addgroup -g 1000 fishuser RUN adduser \ diff --git a/docker/jammy.Dockerfile b/docker/jammy.Dockerfile index ab3d933d8..be570655c 100644 --- a/docker/jammy.Dockerfile +++ b/docker/jammy.Dockerfile @@ -19,9 +19,12 @@ RUN apt-get update \ rustc \ sudo \ tmux \ + python3-pip \ && locale-gen en_US.UTF-8 \ && apt-get clean +RUN pip install black + RUN groupadd -g 1000 fishuser \ && useradd -p $(openssl passwd -1 fish) -d /home/fishuser -m -u 1000 -g 1000 fishuser \ && adduser fishuser sudo \