From 7081573125431f7c0a1cdc9e77f055d61422f69f Mon Sep 17 00:00:00 2001 From: ReimarBauer Date: Mon, 22 Jan 2024 17:28:29 +0100 Subject: [PATCH 1/6] update to miniforge --- Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1fb9df3..447d9b8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Set the base image ubuntu with mamba -FROM condaforge/mambaforge +FROM condaforge/miniforge # Sets which branch to fetch requirements from ARG BRANCH @@ -39,10 +39,9 @@ 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 --all \ && rm reqs.txt \ && cp /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh From 7364c83f9ab11fe91d9e3bd72d7887eca23da519 Mon Sep 17 00:00:00 2001 From: ReimarBauer Date: Mon, 22 Jan 2024 17:33:08 +0100 Subject: [PATCH 2/6] typo --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 447d9b8..f20c63f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Set the base image ubuntu with mamba -FROM condaforge/miniforge +FROM condaforge/miniforge3 # Sets which branch to fetch requirements from ARG BRANCH From 435820248f14a8bec08af173c2f50a7c2e8c8075 Mon Sep 17 00:00:00 2001 From: ReimarBauer Date: Mon, 22 Jan 2024 18:01:41 +0100 Subject: [PATCH 3/6] clean also needs a yes --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f20c63f..ae620b0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ ENV PYTHONPATH="/srv/mss:/root/mss" # Install requirements, fetched from the specified branch -RUN wget -O /meta.yaml -q https://raw.githubusercontent.com/Open-MSS/MSS/${BRANCH}/localbuild/meta.yaml \ +RUN wget -O /meta.yaml -q https://raw.githubusercontent.com/Open-MSS/MSS/${BRANCH}/localbuild/meta.yaml \ && wget -O /development.txt -q https://raw.githubusercontent.com/Open-MSS/MSS/${BRANCH}/requirements.d/development.txt \ && cat /meta.yaml \ | sed -n '/^requirements:/,/^test:/p' \ @@ -41,7 +41,7 @@ RUN wget -O /meta.yaml -q https://raw.githubusercontent.com/Open-MSS/MSS/${BRANC && cat development.txt >> reqs.txt \ && mamba create -y -n mss-${BRANCH}-env --file reqs.txt \ && mamba create -y -n mssenv --file reqs.txt \ - && mamba clean --all \ + && mamba clean -y --all \ && rm reqs.txt \ && cp /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh From 83d5dc052f8116645b3c5629cb3f7af17eeccdbe Mon Sep 17 00:00:00 2001 From: ReimarBauer Date: Mon, 22 Jan 2024 18:23:13 +0100 Subject: [PATCH 4/6] further updates to mamba --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ae620b0..25ba666 100644 --- a/Dockerfile +++ b/Dockerfile @@ -43,9 +43,10 @@ RUN wget -O /meta.yaml -q https://raw.githubusercontent.com/Open-MSS/MSS/${BRAN && mamba create -y -n mssenv --file reqs.txt \ && 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" ] From 318a47d38b67b53f0ef0d708db31b7d0512ff6c0 Mon Sep 17 00:00:00 2001 From: ReimarBauer Date: Mon, 22 Jan 2024 18:28:17 +0100 Subject: [PATCH 5/6] v4 --- .github/workflows/docker-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: | From 1943768122d036d7bdd831b23a49aa395c6f1312 Mon Sep 17 00:00:00 2001 From: ReimarBauer Date: Tue, 23 Jan 2024 08:12:16 +0100 Subject: [PATCH 6/6] blank removed --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 25ba666..d462ea1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ ENV PYTHONPATH="/srv/mss:/root/mss" # Install requirements, fetched from the specified branch -RUN wget -O /meta.yaml -q https://raw.githubusercontent.com/Open-MSS/MSS/${BRANCH}/localbuild/meta.yaml \ +RUN wget -O /meta.yaml -q https://raw.githubusercontent.com/Open-MSS/MSS/${BRANCH}/localbuild/meta.yaml \ && wget -O /development.txt -q https://raw.githubusercontent.com/Open-MSS/MSS/${BRANCH}/requirements.d/development.txt \ && cat /meta.yaml \ | sed -n '/^requirements:/,/^test:/p' \