From 50dba8afab912ce2f169d5bf6eebbe43df909019 Mon Sep 17 00:00:00 2001 From: Jenny Fothergill Date: Wed, 24 Apr 2024 18:17:39 -0600 Subject: [PATCH] Move yml into workflows and make dockerfile easier to read --- .github/{ => workflows}/build.yml | 0 jukes-micromamba/Dockerfile | 18 +++++++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) rename .github/{ => workflows}/build.yml (100%) diff --git a/.github/build.yml b/.github/workflows/build.yml similarity index 100% rename from .github/build.yml rename to .github/workflows/build.yml diff --git a/jukes-micromamba/Dockerfile b/jukes-micromamba/Dockerfile index 1457436..cd40fdb 100644 --- a/jukes-micromamba/Dockerfile +++ b/jukes-micromamba/Dockerfile @@ -1,17 +1,17 @@ FROM mambaorg/micromamba:1.5.8-bookworm-slim -ENV MAMBA_DOCKERFILE_ACTIVATE=1 -ENV ENV_NAME=cautorift - -RUN apt update && apt install -y libgl1 && \ +USER root +RUN apt update && \ + apt install -y libgl1 && \ apt clean +USER $MAMBA_USER RUN micromamba create -n cautorift -c conda-forge python autorift=1.1.0 \ - notebook matplotlib pandas opencv rasterio && \ + notebook matplotlib pandas opencv rasterio && \ micromamba clean --all --yes -ENV SITEPACKAGES=`micromamba run -n cautorift python -m site \ - | grep -m 1 site-packages | sed "s/[,']//g"` -ENV AUTORIFT=${SITEPACKAGES}/autoRIFT/autoRIFT.py +ENV AUTORIFT=opt/conda/envs/cautorift/lib/python3.9/site-packages/autoRIFT/autoRIFT.py RUN sed -i 's/np.bool/bool/g' $AUTORIFT && \ sed -i 's/np.int/int/g' $AUTORIFT -ENV SITEPACKAGES= + ENV AUTORIFT= +ENV MAMBA_DOCKERFILE_ACTIVATE=1 +ENV ENV_NAME=cautorift