Using unified conda-lock file in postBuild for reproducible conda environment

.github/workflows/build.yaml

@@ -6,10 +6,10 @@ on:
       - main
     paths:
       - 'apt.txt'
-      - 'conda-linux-64.lock'
-      - 'environment.yml'
-      - 'start'
+      - 'conda-linux.yml'
+      - 'environment-cryocloud.yml'
       - 'postBuild'
+      - 'start'
       # Trigger rebuilds if the build process changes
       - '.github/workflows/build.yaml'
 

.github/workflows/conda-lock-command.yml

@@ -44,12 +44,12 @@ jobs:
       # HACK: Temporarily pin urllib3<2 to resolve incompatibilities:
       #       https://github.com/ionrock/cachecontrol/issues/292
       - name: Install conda-lock
-        run: 'pip install conda-lock "urllib3<2"'
+        run: 'pip install "conda-lock>=2.0.0" "urllib3<2"'
 
       # Run "conda-lock" for linux-64 only
       - name: Run conda-lock
         run: |
-          conda-lock lock --mamba --kind explicit --file environment.yml --platform linux-64
+          conda-lock lock --mamba --file environment-cryocloud.yml --platform linux-64
 
       # Commit the change to the PR branch if any changes
       - name: Commit condalock files to PR

.github/workflows/test.yaml

@@ -4,8 +4,8 @@ on:
   pull_request:
     paths:
       - 'apt.txt'
-      - 'conda-linux-64.lock'
-      - 'environment.yml'
+      - 'conda-linux.yml'
+      - 'environment-cryocloud.yml'
       - 'postBuild'
       - 'start'
       # Trigger rebuilds if the test process changes

README.md

@@ -18,7 +18,7 @@ doc](https://repo2docker.readthedocs.io/en/latest/config_files.html#config-files
 You can add or update packages on the cryointhecloud hub by making pull requests to this
 repository. Follow these steps:
 
-1. Edit either the [`environment.yml`](https://github.com/CryoInTheCloud/hub-image/edit/main/environment.yml)
+1. Edit either the [`environment-cryocloud.yml`](https://github.com/CryoInTheCloud/hub-image/edit/main/environment-cryocloud.yml)
    file (for most packages) or [`apt.txt`](https://github.com/CryoInTheCloud/hub-image/edit/main/apt.txt)
    file (for packages that need to be used in the Linux Desktop environment in the cloud).
 2. Start a [pull request](https://github.com/CryoInTheCloud/hub-image/pulls) -