From 30f9876c1dad720ab75ca2eb9613b20ad3079cd0 Mon Sep 17 00:00:00 2001 From: Cyrille Nofficial Date: Wed, 2 Nov 2022 16:31:46 +0100 Subject: [PATCH] build: fix docker build (pip index missing) --- Dockerfile | 5 +++-- build-docker.sh | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 11fda75..224785f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,8 @@ FROM docker.io/library/python:3.10-slim as base # Configure piwheels repo to use pre-compiled numpy wheels for arm -RUN echo -n "[global]\nextra-index-url=https://www.piwheels.org/simple\n" >> /etc/pip.conf +RUN echo -n "[global]\n" > /etc/pip.conf &&\ + echo -n "extra-index-url = https://www.piwheels.org/simple https://git.cyrilix.bzh/api/packages/robocars/pypi/simple \n" >> /etc/pip.conf RUN apt-get update && apt-get install -y libgl1 libglib2.0-0 @@ -38,7 +39,7 @@ RUN mkdir /models COPY --from=model-builder /models/mobile_object_localizer_192x192_openvino_2021.4_6shave.blob /models/mobile_object_localizer_192x192_openvino_2021.4_6shave.blob COPY --from=builder dist/*.whl /tmp/ -RUN pip3 install /tmp/*whl +RUN pip3 install /tmp/*.whl WORKDIR /tmp USER 1234 diff --git a/build-docker.sh b/build-docker.sh index 403642b..9bf96c7 100755 --- a/build-docker.sh +++ b/build-docker.sh @@ -7,6 +7,6 @@ PLATFORM="linux/amd64,linux/arm64" #PLATFORM="linux/amd64,linux/arm64,linux/arm/v7" podman build . --platform "${PLATFORM}" --manifest "${IMAGE_NAME}:${TAG}" -podman manifest push --all --format v2s2 "localhost/${IMAGE_NAME}:${TAG}" "docker://${FULL_IMAGE_NAME}" +podman manifest push --all "localhost/${IMAGE_NAME}:${TAG}" "docker://${FULL_IMAGE_NAME}" printf "\nImage %s published" "docker://${FULL_IMAGE_NAME}"