From 60be226f74e32b4e1fa5c972ff16fb15b925058f Mon Sep 17 00:00:00 2001 From: Ben Preston Date: Wed, 6 Dec 2023 12:46:55 +0000 Subject: [PATCH 1/9] Updated XBeam version --- lib/xbeam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/xbeam b/lib/xbeam index 50e4cad40..0ee9712ab 160000 --- a/lib/xbeam +++ b/lib/xbeam @@ -1 +1 @@ -Subproject commit 50e4cad4064ddac65d1444351c51f4d1a0bc4aba +Subproject commit 0ee9712ab3e3312642df284cd0648791ad72ef43 From 0f736b9656a7b124b544ac072dd0dd10835e8a27 Mon Sep 17 00:00:00 2001 From: Ben Preston <144227999+ben-l-p@users.noreply.github.com> Date: Wed, 6 Dec 2023 14:22:38 +0000 Subject: [PATCH 2/9] Remove empty continuation line in Dockerfile --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e6ca1d9df..3d205725d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,7 +33,6 @@ RUN mamba config --set always_yes yes --set changeps1 no RUN mamba update -q conda RUN mamba config --set auto_activate_base false RUN mamba env create -f /sharpy_dir/utils/environment.yml && mamba clean -afy && \ - find /mamba/ -follow -type f -name '*.a' -delete && \ find /mamba/ -follow -type f -name '*.pyc' -delete && \ find /mamba/ -follow -type f -name '*.js.map' -delete From 39b2b30ffc30a266f6eb496cd20bd8959a3d6fc1 Mon Sep 17 00:00:00 2001 From: Ben Preston <144227999+ben-l-p@users.noreply.github.com> Date: Wed, 6 Dec 2023 16:40:10 +0000 Subject: [PATCH 3/9] Split run statement for debugging --- Dockerfile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3d205725d..39b06244e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,10 +32,14 @@ RUN mamba init bash RUN mamba config --set always_yes yes --set changeps1 no RUN mamba update -q conda RUN mamba config --set auto_activate_base false -RUN mamba env create -f /sharpy_dir/utils/environment.yml && mamba clean -afy && \ - find /mamba/ -follow -type f -name '*.a' -delete && \ - find /mamba/ -follow -type f -name '*.pyc' -delete && \ - find /mamba/ -follow -type f -name '*.js.map' -delete +#RUN mamba env create -f /sharpy_dir/utils/environment.yml && mamba clean -afy && \ +# find /mamba/ -follow -type f -name '*.a' -delete && \ +# find /mamba/ -follow -type f -name '*.pyc' -delete && \ +# find /mamba/ -follow -type f -name '*.js.map' -delete +RUN mamba env create -f /sharpy_dir/utils/environment.yml && mamba clean -afy +RUN find /mamba/ -follow -type f -name '*.a' -delete +RUN find /mamba/ -follow -type f -name '*.pyc' -delete +RUN find /mamba/ -follow -type f -name '*.js.map' -delete #COPY /utils/docker/* /root/ RUN ln -s /sharpy_dir/utils/docker/* /root/ From 9bac3b557eb230909277f8d1cf50436676a91b83 Mon Sep 17 00:00:00 2001 From: Ben Preston <144227999+ben-l-p@users.noreply.github.com> Date: Wed, 6 Dec 2023 16:44:50 +0000 Subject: [PATCH 4/9] Update Dockerfile --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 39b06244e..4c562c32e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,7 +36,8 @@ RUN mamba config --set auto_activate_base false # find /mamba/ -follow -type f -name '*.a' -delete && \ # find /mamba/ -follow -type f -name '*.pyc' -delete && \ # find /mamba/ -follow -type f -name '*.js.map' -delete -RUN mamba env create -f /sharpy_dir/utils/environment.yml && mamba clean -afy +RUN mamba env create -f /sharpy_dir/utils/environment.yml +RUN mamba clean -afy RUN find /mamba/ -follow -type f -name '*.a' -delete RUN find /mamba/ -follow -type f -name '*.pyc' -delete RUN find /mamba/ -follow -type f -name '*.js.map' -delete From 215f87be1c95450c4627d923447b4a7b004eaee4 Mon Sep 17 00:00:00 2001 From: Ben Preston <144227999+ben-l-p@users.noreply.github.com> Date: Wed, 6 Dec 2023 16:54:00 +0000 Subject: [PATCH 5/9] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4c562c32e..27e5ee597 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,7 +37,7 @@ RUN mamba config --set auto_activate_base false # find /mamba/ -follow -type f -name '*.pyc' -delete && \ # find /mamba/ -follow -type f -name '*.js.map' -delete RUN mamba env create -f /sharpy_dir/utils/environment.yml -RUN mamba clean -afy +#RUN mamba clean -afy RUN find /mamba/ -follow -type f -name '*.a' -delete RUN find /mamba/ -follow -type f -name '*.pyc' -delete RUN find /mamba/ -follow -type f -name '*.js.map' -delete From 2b0b33e2f9c15943c0d90a1a3fd6d5427d53bcc4 Mon Sep 17 00:00:00 2001 From: Ben Preston <144227999+ben-l-p@users.noreply.github.com> Date: Wed, 6 Dec 2023 17:00:55 +0000 Subject: [PATCH 6/9] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 27e5ee597..200f8de55 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,7 +37,7 @@ RUN mamba config --set auto_activate_base false # find /mamba/ -follow -type f -name '*.pyc' -delete && \ # find /mamba/ -follow -type f -name '*.js.map' -delete RUN mamba env create -f /sharpy_dir/utils/environment.yml -#RUN mamba clean -afy +RUN mamba clean RUN find /mamba/ -follow -type f -name '*.a' -delete RUN find /mamba/ -follow -type f -name '*.pyc' -delete RUN find /mamba/ -follow -type f -name '*.js.map' -delete From 682f4559a9a76e07f72067d0eab674441e179129 Mon Sep 17 00:00:00 2001 From: Ben Preston <144227999+ben-l-p@users.noreply.github.com> Date: Wed, 6 Dec 2023 17:10:59 +0000 Subject: [PATCH 7/9] Update Dockerfile --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 200f8de55..ee7179354 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,14 +30,15 @@ ADD / /sharpy_dir/ # Cleanup mamba installation RUN mamba init bash RUN mamba config --set always_yes yes --set changeps1 no -RUN mamba update -q conda +#RUN mamba update -q conda +RUN mamda update --all RUN mamba config --set auto_activate_base false #RUN mamba env create -f /sharpy_dir/utils/environment.yml && mamba clean -afy && \ # find /mamba/ -follow -type f -name '*.a' -delete && \ # find /mamba/ -follow -type f -name '*.pyc' -delete && \ # find /mamba/ -follow -type f -name '*.js.map' -delete RUN mamba env create -f /sharpy_dir/utils/environment.yml -RUN mamba clean +RUN mamba clean -afy RUN find /mamba/ -follow -type f -name '*.a' -delete RUN find /mamba/ -follow -type f -name '*.pyc' -delete RUN find /mamba/ -follow -type f -name '*.js.map' -delete From 5cc72d7bd0d8c8b9f8ebf40eb17c39a1c11da532 Mon Sep 17 00:00:00 2001 From: Ben Preston <144227999+ben-l-p@users.noreply.github.com> Date: Wed, 6 Dec 2023 17:12:58 +0000 Subject: [PATCH 8/9] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ee7179354..059fb762c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,7 +31,7 @@ ADD / /sharpy_dir/ RUN mamba init bash RUN mamba config --set always_yes yes --set changeps1 no #RUN mamba update -q conda -RUN mamda update --all +RUN mamba update --all RUN mamba config --set auto_activate_base false #RUN mamba env create -f /sharpy_dir/utils/environment.yml && mamba clean -afy && \ # find /mamba/ -follow -type f -name '*.a' -delete && \ From 5a92f77b1198f0681515ec874f544f565f2856ea Mon Sep 17 00:00:00 2001 From: Ben Preston <144227999+ben-l-p@users.noreply.github.com> Date: Wed, 6 Dec 2023 17:18:06 +0000 Subject: [PATCH 9/9] Update Dockerfile to remove clean command --- Dockerfile | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 059fb762c..ec6701f39 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,15 +30,10 @@ ADD / /sharpy_dir/ # Cleanup mamba installation RUN mamba init bash RUN mamba config --set always_yes yes --set changeps1 no -#RUN mamba update -q conda -RUN mamba update --all +RUN mamba update -q conda RUN mamba config --set auto_activate_base false -#RUN mamba env create -f /sharpy_dir/utils/environment.yml && mamba clean -afy && \ -# find /mamba/ -follow -type f -name '*.a' -delete && \ -# find /mamba/ -follow -type f -name '*.pyc' -delete && \ -# find /mamba/ -follow -type f -name '*.js.map' -delete RUN mamba env create -f /sharpy_dir/utils/environment.yml -RUN mamba clean -afy +#RUN mamba clean -afy RUN find /mamba/ -follow -type f -name '*.a' -delete RUN find /mamba/ -follow -type f -name '*.pyc' -delete RUN find /mamba/ -follow -type f -name '*.js.map' -delete