From f15085897fb3ac1a7f5db36810647b61bb07a494 Mon Sep 17 00:00:00 2001 From: Paul Schweigert Date: Tue, 23 May 2023 10:58:25 -0400 Subject: [PATCH] Fix failing builds (#577) This reverts commit b37f6792e293a393bd6b72e49db98dd33b21d188. Signed-off-by: Paul S. Schweigert --- infrastructure/docker/Dockerfile-gateway | 3 ++- infrastructure/docker/Dockerfile-notebook | 3 ++- infrastructure/docker/Dockerfile-ray-qiskit | 3 +-- infrastructure/docker/Dockerfile-repository-server | 1 - 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/infrastructure/docker/Dockerfile-gateway b/infrastructure/docker/Dockerfile-gateway index a7e3254b0..877cf638a 100644 --- a/infrastructure/docker/Dockerfile-gateway +++ b/infrastructure/docker/Dockerfile-gateway @@ -7,7 +7,8 @@ ENV PYTHONDONTWRITEBYTECODE 1 ENV PYTHONUNBUFFERED 1 # install psycopg2 dependencies -RUN apt-get -y update && apt-get -y upgrade && apt-get -y install gcc python3-dev +RUN apt-get -y update \ + && apt-get -y install gcc python3-dev USER 0 COPY gateway . diff --git a/infrastructure/docker/Dockerfile-notebook b/infrastructure/docker/Dockerfile-notebook index e481b5371..33cd92544 100644 --- a/infrastructure/docker/Dockerfile-notebook +++ b/infrastructure/docker/Dockerfile-notebook @@ -2,7 +2,8 @@ ARG IMAGE_PY_VERSION=3.9 FROM jupyter/base-notebook:python-$IMAGE_PY_VERSION USER 0 -RUN apt-get -y update && apt-get -y upgrade && apt-get -y install gcc build-essential libopenblas-dev +RUN apt-get -y update && apt-get -y install gcc build-essential libopenblas-dev + USER $NB_UID COPY --chown=$NB_UID:$NB_UID ./client ./qs diff --git a/infrastructure/docker/Dockerfile-ray-qiskit b/infrastructure/docker/Dockerfile-ray-qiskit index 9e346879a..60c9bbb10 100644 --- a/infrastructure/docker/Dockerfile-ray-qiskit +++ b/infrastructure/docker/Dockerfile-ray-qiskit @@ -1,7 +1,6 @@ ARG IMAGE_PY_VERSION=py39 FROM rayproject/ray:2.4.0-$IMAGE_PY_VERSION AS ray-node-amd64 -RUN apt-get -y update && apt-get -y upgrade USER $RAY_UID COPY --chown=$RAY_UID:$RAY_UID ./client ./qs RUN cd ./qs && pip install . @@ -10,7 +9,7 @@ RUN rm -r ./qs FROM rayproject/ray:2.4.0-$IMAGE_PY_VERSION-aarch64 AS ray-node-arm64 USER $RAY_UID -RUN apt-get -y update && apt-get -y upgrade && apt-get -y install gcc build-essential libopenblas-dev cmake +RUN apt-get -y update && apt-get -y install gcc build-essential libopenblas-dev cmake COPY --chown=$RAY_UID:$RAY_UID ./client ./qs RUN cd ./qs && pip install . RUN if [ $TARGETARCH == arm64 ] ; then pip install git+https://github.com/pyscf/pyscf@v2.2.1; fi diff --git a/infrastructure/docker/Dockerfile-repository-server b/infrastructure/docker/Dockerfile-repository-server index 49767c6b1..ff82155b7 100644 --- a/infrastructure/docker/Dockerfile-repository-server +++ b/infrastructure/docker/Dockerfile-repository-server @@ -7,7 +7,6 @@ ENV PYTHONDONTWRITEBYTECODE 1 ENV PYTHONUNBUFFERED 1 USER 0 -RUN apt-get -y update && apt-get -y upgrade COPY repository . RUN chown -R 1001:0 /usr/src/app