From cb76b548ed00049a1ebb5d78186f84f252f0ade2 Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Sat, 10 Aug 2024 13:34:19 -0400 Subject: [PATCH] Dockerfile: update - use python3 (no need to stay on python3.11 still) - switch to glibc (musl wheels need musl 1.2) - add libgcc (needed by pydantic (thanks rust!)) --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1934ebd..6fc3a9a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,10 @@ -FROM ghcr.io/void-linux/void-musl-full +FROM ghcr.io/void-linux/void-glibc-full COPY . /app WORKDIR /app ARG REPOSITORY=https://repo-fastly.voidlinux.org/current -ARG PKGS="cairo libjpeg-turbo" +ARG PKGS="cairo libjpeg-turbo libgcc" ARG UID 1000 ARG GID 1000 @@ -13,9 +13,9 @@ RUN \ xbps-install -Suy xbps -R ${REPOSITORY} && \ xbps-install -uy -R ${REPOSITORY} && \ echo "**** install system packages ****" && \ - xbps-install -y -R ${REPOSITORY} ${PKGS} python3.11 && \ + xbps-install -y -R ${REPOSITORY} ${PKGS} python3 && \ echo "**** install pip packages ****" && \ - python3.11 -m venv botenv && \ + python3 -m venv botenv && \ botenv/bin/pip install -U pip setuptools wheel && \ botenv/bin/pip install -r requirements.txt && \ echo "**** clean up ****" && \ @@ -24,7 +24,7 @@ RUN \ /tmp/* \ /var/cache/xbps/* -ENV PYTHONUNBUFFERED 1 +ENV PYTHONUNBUFFERED=1 USER $UID:$GID