5505-public/idear-template
Template
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to naming of network_drive as network_mount (includes both server name and share). when run locally, network mount defaults to data folder

Browse Source
This commit is contained in:
florez_j
2025-06-22 15:15:03 +02:00
parent 6a804f4b0d
commit d22e3dacc6
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -94,7 +94,7 @@ This toolkit includes a containerized JupyterLab environment for executing the d
5. Start the environment: 5. Start the environment:
- **Locally without network drive mount:** - **Locally without network drive mount:**
Regardless of value in .env, `NETWORK_MOUNT` defaults to `<your-repo-name>/data/`.
```bash ```bash
docker compose up idear_processor docker compose up idear_processor
@ -104,7 +104,7 @@ This toolkit includes a containerized JupyterLab environment for executing the d
docker compose up idear_processor_networked docker compose up idear_processor_networked
6. Access: 6. Access:
- **Jupyter Lab**: [http://localhost:8889/lab/tree/](http://localhost:8889/lab/tree/) - **Jupyter Lab**: [http://localhost:8889/lab/](http://localhost:8889/lab/)
7. Stop the app: 7. Stop the app:
In the previously open PowerShell terminal, enter: In the previously open PowerShell terminal, enter:

9
campaignDescriptor.yaml
View File

@ -2,11 +2,10 @@
# Configuration for FAIR Data Integration Pipeline # Configuration for FAIR Data Integration Pipeline
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# INPUT DATA DIRECTORY
# Can be a local or network path. Examples: # Can be a local or network path. Examples:
# - Local: '../data/data_folder/' # manually create data_folder/ with instrument folders # - Local: '../data/data_folder/' # All paths must be relative to folder ../data/
# - Network: /mnt/network_drive/data_folder (Docker) # - Network: /mnt/network_drive/data_folder or equivalently ${NETWORK_MOUNT}/data_folder
input_file_directory: '/mnt/network_drive/Data' input_file_directory: '/mnt/network_mount/Data'
# OUTPUT DATA DIRECTORY # OUTPUT DATA DIRECTORY
# Always relative to notebook location. If run from `notebooks/`, # Always relative to notebook location. If run from `notebooks/`,
@ -30,7 +29,7 @@ dataset_startdate: 'YYYY-MM-DD'
dataset_enddate: 'YYYY-MM-DD' dataset_enddate: 'YYYY-MM-DD'
# Data processing level (typically '0', '1', or '2'; follows ACTRIS or custom standards) # Data processing level (typically '0', '1', or '2'; follows ACTRIS or custom standards)
actris_level: '1' actris_level: '0'
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# Output File Naming Convention (Optional) # Output File Naming Convention (Optional)

6
docker-compose.yaml
View File

@ -6,6 +6,7 @@ services:
restart: unless-stopped restart: unless-stopped
environment: environment:
- DOCKER_CONTAINER=1 - DOCKER_CONTAINER=1
- NETWORK_MOUNT=/mnt/network_mount
ports: ports:
- "${JUPYTER_PORT:-8889}:8888" - "${JUPYTER_PORT:-8889}:8888"
volumes: volumes:
@ -13,7 +14,7 @@ services:
- ./figures:/idear/figures - ./figures:/idear/figures
- ./notebooks:/idear/notebooks - ./notebooks:/idear/notebooks
- ./scripts:/idear/scripts - ./scripts:/idear/scripts
- network_drive:/mnt/network_drive:rw - network_mount:/mnt/network_mount:rw
command: > command: >
bash -c " bash -c "
jupyter lab --ip=0.0.0.0 --port=8888 --no-browser --allow-root --NotebookApp.token='${JUPYTER_TOKEN:-my-token}' jupyter lab --ip=0.0.0.0 --port=8888 --no-browser --allow-root --NotebookApp.token='${JUPYTER_TOKEN:-my-token}'
@ -26,6 +27,7 @@ services:
restart: unless-stopped restart: unless-stopped
environment: environment:
- DOCKER_CONTAINER=1 - DOCKER_CONTAINER=1
- NETWORK_MOUNT=/idear/data
ports: ports:
- "${JUPYTER_PORT:-8889}:8888" - "${JUPYTER_PORT:-8889}:8888"
volumes: volumes:
@ -38,7 +40,7 @@ services:
- local-only - local-only
volumes: volumes:
network_drive: network_mount:
driver_opts: driver_opts:
type: cifs type: cifs
o: "username=${CIFS_USER},password=${CIFS_PASS},vers=3.0" o: "username=${CIFS_USER},password=${CIFS_PASS},vers=3.0"