From 9806a5ae30783f0e552d70c06a2d3874e1ef1bc2 Mon Sep 17 00:00:00 2001 From: hpatel426 Date: Thu, 5 Oct 2023 16:47:49 -0400 Subject: [PATCH 1/3] updated docker file and removed hdf5 --- docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 353fea4..e5888c9 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -5,8 +5,8 @@ RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get upgrade -y \ gcc \ libnetcdf-dev \ - libhdf5-dev \ - hdf5-helpers \ + #libhdf5-dev \ + #hdf5-helpers \ && pip3 install --upgrade pip \ && pip3 install cython \ && apt-get clean From 1019a59981dd57d89be9abdf27573943750e59ee Mon Sep 17 00:00:00 2001 From: hpatel426 Date: Fri, 6 Oct 2023 15:30:39 -0400 Subject: [PATCH 2/3] updated docker path and installed poetry --- docker/Dockerfile | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index e5888c9..0725fe9 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -9,7 +9,8 @@ RUN apt-get update \ #hdf5-helpers \ && pip3 install --upgrade pip \ && pip3 install cython \ - && apt-get clean + && apt-get clean \ + && pip3 install poetry # Create a new user RUN adduser --quiet --disabled-password --shell /bin/sh --home /home/dockeruser --gecos "" --uid 1000 dockeruser @@ -27,13 +28,22 @@ ARG DIST_PATH USER root RUN mkdir -p /worker && chown dockeruser /worker +COPY ../pyproject.toml /worker USER dockeruser + WORKDIR /worker +ENV PYTHONPATH=${PYTHONPATH}:${PWD} + COPY --chown=dockeruser $DIST_PATH $DIST_PATH USER dockeruser -RUN pip3 install --no-cache-dir --force --user --index-url https://pypi.org/simple/ --extra-index-url https://test.pypi.org/simple/ $SOURCE \ - && rm -rf $DIST_PATH +#RUN pip3 install --no-cache-dir --force --user --index-url https://pypi.org/simple/ --extra-index-url https://test.pypi.org/simple/ $SOURCE \ +# && rm -rf $DIST_PATH +USER root +RUN poetry config virtualenvs.create false +RUN poetry install --no-dev + +USER dockeruser # Run the Batchee Harmony service ENTRYPOINT ["batchee_harmony"] \ No newline at end of file From 90fb263aa2507553febf385dec2353b252434e7c Mon Sep 17 00:00:00 2001 From: hpatel426 Date: Tue, 10 Oct 2023 12:52:25 -0400 Subject: [PATCH 3/3] updated docker file to include poetry installation as root --- docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index 0725fe9..1f74124 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -40,6 +40,7 @@ USER dockeruser #RUN pip3 install --no-cache-dir --force --user --index-url https://pypi.org/simple/ --extra-index-url https://test.pypi.org/simple/ $SOURCE \ # && rm -rf $DIST_PATH +#install poetry as root USER root RUN poetry config virtualenvs.create false RUN poetry install --no-dev