Merge pull request #2 from CNES/feat/add-otb

Feat/add otb
CNES · Dec 20, 2024 · a75cf6b · a75cf6b
2 parents 33dfad1 + c6b78fe
commit a75cf6b
Show file tree

Hide file tree

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

diff --git a/.github/workflows/CondaLock.yml b/.github/workflows/CondaLock.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        IMAGE: [base-notebook, pangeo-notebook, pytorch-notebook]
+        IMAGE: [base-notebook, pangeo-notebook, dtf-notebook]
     name: ${{ matrix.IMAGE }}
     runs-on: ubuntu-latest
     timeout-minutes: 180

diff --git a/.github/workflows/Publish.yml b/.github/workflows/Publish.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        IMAGE: [base-image, base-notebook, pangeo-notebook, pytorch-notebook]
+        IMAGE: [dtf-notebook]
     name: ${{ matrix.IMAGE }}
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
@@ -19,7 +19,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        IMAGE: [base-notebook, pangeo-notebook, pytorch-notebook]
+        IMAGE: [base-notebook, pangeo-notebook, dtf-notebook]
     name: ${{ matrix.IMAGE }}
     runs-on: ubuntu-latest
     services:

diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@
 
 # Makefile for convenience, (doesn't look for command outputs)
 .PHONY: all
-all: base-image base-notebook pangeo-notebook pytorch-notebook
+all: base-image base-notebook pangeo-notebook dtf-notebook
 TESTDIR=/srv/test
 
 .PHONY: base-image
@@ -30,13 +30,13 @@ pangeo-notebook : base-image
 	docker build -t cnes/pangeo-notebook:master . --progress=plain --platform linux/amd64; \
 	docker run -w $(TESTDIR) -v $(PWD):$(TESTDIR) cnes/pangeo-notebook:master ./run_tests.sh pangeo-notebook
 
-.PHONY: pytorch-notebook
-pytorch-notebook : base-image
-	cd pytorch-notebook ; \
+.PHONY: dtf-notebook
+dtf-notebook : base-image
+	cd dtf-notebook ; \
 	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
+	docker build -t cnes/dtf-notebook:master . ; \
+	docker run -w $(TESTDIR) -v $(PWD):$(TESTDIR) cnes/dtf-notebook:master ./run_tests.sh dtf-notebook
diff --git a/pytorch-notebook/Dockerfile → dtf-notebook/Dockerfile b/pytorch-notebook/Dockerfile → dtf-notebook/Dockerfile
diff --git a/pytorch-notebook/apt.txt → dtf-notebook/apt.txt b/pytorch-notebook/apt.txt → dtf-notebook/apt.txt
diff --git a/pytorch-notebook/conda-linux-64.lock → dtf-notebook/conda-linux-64.lock b/pytorch-notebook/conda-linux-64.lock → dtf-notebook/conda-linux-64.lock