Merge branch 'pangeo-notebook/init' of github.com:CNES/datalabs-docke…

…r-images into pangeo-notebook/init
CNES · Nov 28, 2024 · a3b5e1a · a3b5e1a
2 parents 53376d1 + d362449
commit a3b5e1a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
@@ -60,6 +60,7 @@ jobs:
       fail-fast: false
       matrix:
         IMAGE: [base-notebook, pangeo-notebook, pytorch-notebook]
+        IMAGE: [base-notebook, pangeo-notebook, pytorch-notebook]
     name: ${{ matrix.IMAGE }}
     runs-on: ubuntu-latest
     steps:

diff --git a/Makefile b/Makefile
@@ -1,5 +1,7 @@
 -include .env
 
+-include .env
+
 # Makefile for convenience, (doesn't look for command outputs)
 .PHONY: all
 all: base-image base-notebook pangeo-notebook ml-notebook pytorch-notebook
@@ -14,6 +16,7 @@ base-image :
 base-notebook : base-image
 	cd base-notebook ; \
 	conda-lock lock --mamba -f environment.yml -p linux-64; \
+	conda-lock lock --mamba -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; \
@@ -24,6 +27,8 @@ 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; \
+	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 render -k explicit -p linux-64; \
 	../generate-packages-list.py conda-linux-64.lock > packages.txt; \
 	docker build -t cnes/pangeo-notebook:master . --progress=plain --platform linux/amd64; \
@@ -36,6 +41,7 @@ pangeo-notebook : base-image
 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; \
+	conda-lock lock --mamba -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; \
 	docker build -t cnes/pytorch-notebook:master . ; \