diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 86792ac..56b582c 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -22,7 +22,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Build image run: | diff --git a/Dockerfile b/Dockerfile index 1fb9df3..d462ea1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Set the base image ubuntu with mamba -FROM condaforge/mambaforge +FROM condaforge/miniforge3 # Sets which branch to fetch requirements from ARG BRANCH @@ -39,14 +39,14 @@ RUN wget -O /meta.yaml -q https://raw.githubusercontent.com/Open-MSS/MSS/${BRANC | sed -e "s/menuinst.*//" \ | sed -e "s/.*://" > reqs.txt \ && cat development.txt >> reqs.txt \ - && echo pyvirtualdisplay >> reqs.txt \ && mamba create -y -n mss-${BRANCH}-env --file reqs.txt \ && mamba create -y -n mssenv --file reqs.txt \ - && conda clean --all \ + && mamba clean -y --all \ && rm reqs.txt \ - && cp /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh + && cp /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh \ + && cp /opt/conda/etc/profile.d/mamba.sh /etc/profile.d/mamba.sh # execute /etc/profile also in non-interactive use -ENV BASH_ENV /etc/profile.d/conda.sh +ENV BASH_ENV /etc/profile.d/mamba.sh # default command to start when run CMD [ "/bin/bash", "--login" ]