Rebuild pyenv environments can be time-consuming and irrelevant to this
project. Use a prebuild image to save some time here.
Signed-off-by: You-Sheng Yang <vic...@gmail.com>
---
tools/docker/Dockerfile | 26 +-------------------------
1 file changed, 1 insertion(+), 25 deletions(-)
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index d9d0905..821ad37 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM vicamo/pyenv:latest-bionic
ARG UID
ARG GID
@@ -10,11 +10,6 @@ RUN echo $UID; echo $GID; \
[ -n "$GID" ] || { echo "You must define GID in .env" 1>&2; exit 1; }
ARG TZ="Australia/Canberra"
-ENV LANG="C.UTF-8"
-ENV LC_ALL="C.UTF-8"
-ENV PATH="/opt/pyenv/shims:/opt/pyenv/bin:$PATH"
-ENV PYENV_ROOT="/opt/pyenv"
-ENV PYENV_SHELL="bash"
ENV DEBIAN_FRONTEND noninteractive
ENV PYTHONUNBUFFERED 1
ENV PROJECT_HOME /home/patchwork/patchwork
@@ -25,34 +20,15 @@ RUN groupadd --gid=$GID patchwork && \
RUN rm -f /etc/localtime; ln -s /usr/share/zoneinfo/$TZ /etc/localtime
RUN apt-get update && apt-get install -y --no-install-recommends \
- build-essential \
- ca-certificates \
- curl \
- git \
- libbz2-dev \
- libffi-dev \
libmysqlclient-dev \
libpq-dev \
- libreadline-dev \
libsqlite3-dev \
- libssl-dev \
mysql-client \
postgresql-client \
sqlite3 \
tzdata \
- zlib1g-dev \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-RUN curl -L
https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash
&& \
- git clone https://github.com/momo-lab/xxenv-latest
$PYENV_ROOT/plugins/xxenv-latest && \
- pyenv update
-
-RUN pyenv latest install 3.6 && \
- pyenv latest install 3.7 && \
- pyenv latest install 3.8 && \
- pyenv latest install 3.9
-RUN pyenv global $(pyenv versions --bare | tac)
-
RUN pip install tox tox-pyenv
# we deliberately leave the requirements files in /opt so we can ping the user
--
2.32.0
_______________________________________________
Patchwork mailing list
Patchwork@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/patchwork
