Pytorch notebook/init

.github/workflows/Build.yml

@@ -48,7 +48,7 @@ jobs:
       uses: docker/build-push-action@v6
       with:
         context: ${{ env.IMAGE }}
-        platforms: linux/amd64,linux/arm64
+        platforms: linux/amd64
         push: true
         tags: |
           ${{env.DOCKER_ORG}}/${{ env.IMAGE }}:master
@@ -98,7 +98,7 @@ jobs:
       with:
         context: ${{ matrix.IMAGE }}
         push: true
-        platforms: linux/amd64,linux/arm64
+        platforms: linux/amd64
         tags: |
           ${{env.DOCKER_ORG}}/${{ matrix.IMAGE }}:master
           ${{env.DOCKER_ORG}}/${{ matrix.IMAGE }}:${{env.DOCKER_TAG}}

.github/workflows/CondaLock.yml

@@ -39,9 +39,9 @@ jobs:
         run: |
           cd ${{ matrix.IMAGE }}
           if [ ${{ matrix.IMAGE }} = "base-notebook" ]; then
-            conda-lock lock -p linux-64 -p linux-aarch64 -p osx-64 -p osx-arm64
+            conda-lock lock -p linux-64
           elif [ ${{ matrix.IMAGE }} = "pangeo-notebook" ]; then
-            conda-lock lock -f environment.yml -f ../base-notebook/environment.yml -p linux-64 -p linux-aarch64 -p osx-64 -p osx-arm64
+            conda-lock lock -f environment.yml -f ../base-notebook/environment.yml -p linux-64
           else
             # Linux-64 ONLY
             conda-lock lock -f environment.yml -f ../pangeo-notebook/environment.yml -f ../base-notebook/environment.yml -p linux-64

.github/workflows/Test.yml

@@ -54,7 +54,7 @@ jobs:
       uses: docker/build-push-action@v6
       with:
         context: base-image
-        platforms: linux/amd64,linux/arm64
+        platforms: linux/amd64
         tags: localhost:5000/cnes/base-image:PR
         push: true
         cache-from: type=gha
@@ -64,7 +64,7 @@ jobs:
       uses: docker/build-push-action@v6
       with:
         context: ${{ matrix.IMAGE }}
-        platforms: linux/amd64,linux/arm64
+        platforms: linux/amd64
         push: true
         tags: localhost:5000/${{env.DOCKER_ORG}}/${{ matrix.IMAGE }}:PR
         build-args: PANGEO_BASE_IMAGE_TAG=PR

Makefile

@@ -2,7 +2,7 @@
 
 # Makefile for convenience, (doesn't look for command outputs)
 .PHONY: all
-all: base-image base-notebook pangeo-notebook ml-notebook pytorch-notebook
+all: base-image base-notebook pangeo-notebook pytorch-notebook
 TESTDIR=/srv/test
 
 .PHONY: base-image
@@ -13,7 +13,7 @@ base-image :
 .PHONY: base-notebook
 base-notebook : base-image
 	cd base-notebook ; \
-	conda-lock lock --mamba -f environment.yml -p linux-64; \
+	conda-lock lock -f environment.yml -p linux-64; \
 	conda-lock render -k explicit -p linux-64; \
 	../generate-packages-list.py conda-linux-64.lock > packages.txt; \
 	docker build -t cnes/base-notebook:master . --no-cache --progress=plain --platform linux/amd64; \
@@ -23,7 +23,7 @@ base-notebook : base-image
 pangeo-notebook : base-image
 	cd pangeo-notebook ; \
 	cp -r ../base-notebook/resources . ; \
-	conda-lock lock --mamba -f environment.yml -f ../base-notebook/environment.yml -f ../base-notebook/environment.yml -p linux-64; \
+	conda-lock lock -f environment.yml -f ../base-notebook/environment.yml -f ../base-notebook/environment.yml -p linux-64; \
 	conda-lock render -k explicit -p linux-64; \
 	../generate-packages-list.py conda-linux-64.lock > packages.txt; \
 	../merge-apt.sh ../base-notebook/apt.txt apt.txt; \
@@ -33,8 +33,10 @@ pangeo-notebook : base-image
 .PHONY: pytorch-notebook
 pytorch-notebook : base-image
 	cd pytorch-notebook ; \
-	conda-lock lock --mamba -f environment.yml -f ../pangeo-notebook/environment.yml -f ../base-notebook/environment.yml -p linux-64; \
+	cp -r ../pangeo-notebook/resources ../base-notebook/resources . ; \
+	conda-lock lock -f environment.yml -f ../pangeo-notebook/environment.yml -f ../base-notebook/environment.yml -p linux-64; \
 	conda-lock render -k explicit -p linux-64; \
 	../generate-packages-list.py conda-linux-64.lock > packages.txt; \
+	../merge-apt.sh ../pangeo-notebook/apt.txt ../base-notebook/apt.txt apt.txt; \
 	docker build -t cnes/pytorch-notebook:master . ; \
 	docker run -w $(TESTDIR) -v $(PWD):$(TESTDIR) cnes/pytorch-notebook:master ./run_tests.sh pytorch-notebook

base-image/Dockerfile

@@ -140,7 +140,7 @@ ONBUILD RUN echo "Checking for 'jupyter_notebook_config.py'..." \
         && cp jupyter_notebook_config.py /etc/jupyter \
         ; fi
 
-ONBUILD USER ${NB_USER}
+# ONBUILD USER ${NB_USER}
 
 # We want to keep our images as reproducible as possible. If a lock
 # file with exact versions of all required packages is present, we use

pangeo-notebook/conda-linux-64.lock

@@ -1,6 +1,7 @@
 # Generated by conda-lock.
 # platform: linux-64
 # input_hash: 51a7de05b0fe1efe11c5457b666b4c69da061c0c7be4c21639f5b2bb83ec843a
+# input_hash: 51a7de05b0fe1efe11c5457b666b4c69da061c0c7be4c21639f5b2bb83ec843a
 @EXPLICIT
 https://conda.anaconda.org/conda-forge/linux-64/_libgcc_mutex-0.1-conda_forge.tar.bz2#d7c89558ba9fa0495403155b64376d81
 https://conda.anaconda.org/conda-forge/linux-64/_py-xgboost-mutex-2.0-gpu_0.tar.bz2#7702188077361f43a4d61e64c694f850
@@ -439,6 +440,7 @@ https://conda.anaconda.org/conda-forge/noarch/traittypes-0.2.1-pyh9f0ad1d_2.tar.
 https://conda.anaconda.org/conda-forge/noarch/trollsift-0.5.1-pyhd8ed1ab_0.conda#5819998373586657ba9868756c0aaf8a
 https://conda.anaconda.org/conda-forge/noarch/typer-slim-0.13.1-pyhff2d567_0.conda#85283fb942fa2604c3db03483027ced2
 https://conda.anaconda.org/conda-forge/noarch/typing-extensions-4.12.2-hd8ed1ab_0.conda#52d648bd608f5737b123f510bb5514b5
+https://conda.anaconda.org/conda-forge/linux-64/ucx-1.17.0-h0104b51_3.conda#cbd9d35cbfb829275fde06d292afcc8b
 https://conda.anaconda.org/conda-forge/noarch/urllib3-1.26.19-pyhd8ed1ab_0.conda#6bb37c314b3cc1515dcf086ffe01c46e
 https://conda.anaconda.org/conda-forge/noarch/webob-1.8.9-pyhd8ed1ab_0.conda#ff98f23ad74d2a3256debcd9df65d37d
 https://conda.anaconda.org/conda-forge/noarch/yamale-5.2.1-pyhca7485f_0.conda#c089f90a086b6214c5606368d0d3bad0