fix: change names to match dockerhub repository

.github/workflows/CondaLock.yml

@@ -74,8 +74,8 @@ jobs:
 
       - name: Commit condalock files to PR
         run: |
-          git config --global user.name 'pangeo-bot'
-          git config --global user.email 'pangeo-bot@users.noreply.github.com'
+          git config --global user.name 'datalabs-bot'
+          git config --global user.email 'datalabs-bot@users.noreply.github.com'
           git status
           git add */conda*.lock */conda-lock.yml */packages.txt
           git commit -m "[condalock-command] autogenerated conda-lock files"

.github/workflows/PR.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   DeployPangeoBot:
     runs-on: ubuntu-latest
-    if: github.repository == 'pangeo-data/pangeo-docker-images'
+    if: github.repository == 'CNES/datalabs-docker-images'
 
     steps:
       - name: Checkout Repository

.github/workflows/Test.yml

@@ -10,7 +10,7 @@ on:
     types: [opened, synchronize, reopened]
 
 env:
-  DOCKER_ORG: pangeo
+  DOCKER_ORG: cnes
   GITHUB_SHA: ${{ github.sha }}
   GITHUB_REF: ${{ github.ref }}
 
@@ -69,7 +69,7 @@ jobs:
         tags: localhost:5000/${{env.DOCKER_ORG}}/${{ matrix.IMAGE }}:PR
         build-args: PANGEO_BASE_IMAGE_TAG=PR
         build-contexts: |
-          pangeo/base-image:PR=docker-image://localhost:5000/pangeo/base-image:PR
+          cnes/base-image:PR=docker-image://localhost:5000/cnes/base-image:PR
 
     - name: List Conda Packages
       run: |

.github/workflows/WatchCondaForge.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   check-version:
     runs-on: ubuntu-latest
-    if: github.repository == 'pangeo-data/pangeo-docker-images'
+    if: github.repository == 'CNES/datalabs-docker-images'
 
     steps:
       - name: Checkout Repository
@@ -57,11 +57,11 @@ jobs:
         id: cpr
         uses: peter-evans/create-pull-request@v7
         with:
-          committer: Pangeo Bot <pangeo-bot@users.noreply.github.com>
+          committer: Datalabs Bot <datalabs-bot@users.noreply.github.com>
           token: ${{ secrets.DATALABSBOT_TOKEN }}
           commit-message: "Update pangeo-notebook metapackage version to ${{ steps.latest_version.outputs.version }}"
           title: "Update pangeo-notebook metapackage version to ${{ steps.latest_version.outputs.version }}"
-          reviewers: "scottyhq"
+          reviewers: "eroan.marie"
           branch: ${{ env.PR_BRANCH }}
           body: |
             A new pangeo-metapackage version has been detected.

Makefile

@@ -8,16 +8,16 @@ TESTDIR=/srv/test
 .PHONY: base-image
 base-image :
 	cd base-image ; \
-	docker build -t datalabs/base-image:master --progress=plain --platform linux/amd64 .
+	docker build -t cnes/base-image:master --progress=plain --platform linux/amd64 .
 
 .PHONY: base-notebook
 base-notebook : base-image
 	cd base-notebook ; \
 	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 datalabs/base-notebook:master . --no-cache --progress=plain --platform linux/amd64; \
-	docker run -w $(TESTDIR) -v $(PWD):$(TESTDIR) datalabs/base-notebook:master ./run_tests.sh base-notebook
+	docker build -t cnes/base-notebook:master . --no-cache --progress=plain --platform linux/amd64; \
+	docker run -w $(TESTDIR) -v $(PWD):$(TESTDIR) cnes/base-notebook:master ./run_tests.sh base-notebook
 
 .PHONY: pangeo-notebook
 pangeo-notebook : base-image
@@ -26,14 +26,14 @@ pangeo-notebook : base-image
 	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; \
-	docker build -t datalabs/pangeo-notebook:master . --progress=plain --platform linux/amd64; \
-	docker run -w $(TESTDIR) -v $(PWD):$(TESTDIR) datalabs/pangeo-notebook:master ./run_tests.sh pangeo-notebook
+	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 ; \
 	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; \
-	docker build -t datalabs/pytorch-notebook:master . ; \
-	docker run -w $(TESTDIR) -v $(PWD):$(TESTDIR) datalabs/pytorch-notebook:master ./run_tests.sh pytorch-notebook
+	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

@@ -194,6 +194,8 @@ ONBUILD RUN for script in $(find "resources" -type f -name "install.sh"); do \
         layer-cleanup.sh; \
     done
 
+ONBUILD USER ${NB_USER}
+
 # If a postBuild file exists, run it!
 # After it's done, we try to remove any possible cruft commands there
 # leave behind under $HOME - particularly stuff that jupyterlab extensions

base-notebook/Dockerfile

@@ -3,4 +3,4 @@
 # files (such as conda-linux-64.lock, start) in this repo.
 # Refer to the base-image/Dockerfile for documentation.
 ARG PANGEO_BASE_IMAGE_TAG=master
-FROM datalabs/base-image:${PANGEO_BASE_IMAGE_TAG}
+FROM cnes/base-image:${PANGEO_BASE_IMAGE_TAG}

pangeo-notebook/Dockerfile

@@ -3,4 +3,4 @@
 # files (such as conda-linux-64.lock, start) in this repo.
 # Refer to the base-image/Dockerfile for documentation.
 ARG PANGEO_BASE_IMAGE_TAG=master
-FROM pangeo/base-image:${PANGEO_BASE_IMAGE_TAG}
+FROM cnes/base-image:${PANGEO_BASE_IMAGE_TAG}

pytorch-notebook/Dockerfile

@@ -3,7 +3,7 @@
 # files (such as conda-linux-64.lock, start) in this repo.
 # Refer to the base-image/Dockerfile for documentation.
 ARG PANGEO_BASE_IMAGE_TAG=master
-FROM pangeo/base-image:${PANGEO_BASE_IMAGE_TAG}
+FROM cnes/base-image:${PANGEO_BASE_IMAGE_TAG}
 
 # Required for nvidia drivers to work inside the image on GKE
 # No-ops on other platforms - Azure doesn't need these set.