]> git.madduck.net Git - etc/vim.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

makes install available for all users in docker image (#3202)
authorNicolò Intrieri <81313286+n-borges@users.noreply.github.com>
Tue, 2 Aug 2022 16:01:15 +0000 (18:01 +0200)
committerGitHub <noreply@github.com>
Tue, 2 Aug 2022 16:01:15 +0000 (09:01 -0700)
* makes install available for all users in docker image

moves the installation path from /root/.local to a
virtualenv. this way we still get the lightweight
multistage build without excluding non-root users.

* adds changelog entry for docker-image fix

A changelog entry has been added under the Integration
subheader

* changes dockerfile to use the venv activate script

we are now using the inbuilt venv activate script, as well
as explicitly mentioning the binary location in the entrypoint
cmd.

Co-authored-by: Nicolò <nicolo.intrieri@spinforward.it>
Co-authored-by: Cooper Lees <me@cooperlees.com>
CHANGES.md
Dockerfile

index a30ac7f25e19a4f7971fc9ebab90d1de5367d301..5b29f20bfffb676bc2b2083e706e5b7d3cf0d987 100644 (file)
@@ -47,6 +47,8 @@
 <!-- For example, Docker, GitHub Actions, pre-commit, editors -->
 
 - Vim plugin: prefix messages with `Black: ` so it's clear they come from Black (#3194)
 <!-- For example, Docker, GitHub Actions, pre-commit, editors -->
 
 - Vim plugin: prefix messages with `Black: ` so it's clear they come from Black (#3194)
+- Docker: changed to a /opt/venv installation + added to PATH to be available to
+  non-root users (#3202)
 
 ### Output
 
 
 ### Output
 
index c393e29f6320e951f155d137264f8798c317555f..4e8f12f97981accfe603e03f368fbe98d4c7cea5 100644 (file)
@@ -2,16 +2,18 @@ FROM python:3-slim AS builder
 
 RUN mkdir /src
 COPY . /src/
 
 RUN mkdir /src
 COPY . /src/
-RUN pip install --no-cache-dir --upgrade pip setuptools wheel \
+ENV VIRTUAL_ENV=/opt/venv
+RUN python -m venv $VIRTUAL_ENV
+RUN . /opt/venv/bin/activate && pip install --no-cache-dir --upgrade pip setuptools wheel \
     # Install build tools to compile dependencies that don't have prebuilt wheels
     && apt update && apt install -y git build-essential \
     && cd /src \
     # Install build tools to compile dependencies that don't have prebuilt wheels
     && apt update && apt install -y git build-essential \
     && cd /src \
-    && pip install --user --no-cache-dir .[colorama,d]
+    && pip install --no-cache-dir .[colorama,d]
 
 FROM python:3-slim
 
 # copy only Python packages to limit the image size
 
 FROM python:3-slim
 
 # copy only Python packages to limit the image size
-COPY --from=builder /root/.local /root/.local
-ENV PATH=/root/.local/bin:$PATH
+COPY --from=builder /opt/venv /opt/venv
+ENV PATH="/opt/venv/bin:$PATH"
 
 
-CMD ["black"]
+CMD ["/opt/venv/bin/black"]