Skip to content

Commit

Permalink
refactor: change more image references to ghcr.io
Browse files Browse the repository at this point in the history
  • Loading branch information
wholtz committed Oct 16, 2023
1 parent ee30837 commit 8e51116
Show file tree
Hide file tree
Showing 10 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion metatlas/scripts/copy_ms_to_new_names.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash

shifter -e PYTHONPATH=/src --image=doejgi/metatlas_shifter:latest python /src/metatlas/scripts/copy_ms_to_new_names.py $@
shifter -e PYTHONPATH=/src --image=ghcr.io/biorack/metatlas/metatlas_shifter:latest python /src/metatlas/scripts/copy_ms_to_new_names.py $@
2 changes: 1 addition & 1 deletion metatlas/scripts/run_file_converter.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ LOGFILE="/global/cfs/cdirs/m2650/file_converter_logs/file_converter.log"
RAW_DATA_PATH=/global/cfs/cdirs/metatlas/raw_data

# pass in PYTHONPATH and don't use "--entrypoint" so that it doesn't copy the git repo to /tmp/metatlas.*
BIN_PATH="shifter -e PYTHONPATH=/src --image=doejgi/metatlas_shifter:latest /usr/local/bin/python"
BIN_PATH="shifter -e PYTHONPATH=/src --image=ghcr.io/biorack/metatlas/metatlas_shifter:latest /usr/local/bin/python"

$BIN_PATH -m metatlas.io.file_converter "$RAW_DATA_PATH" &>> "${LOGFILE}" &

Expand Down
2 changes: 1 addition & 1 deletion notebooks/reference/Add_Atlas_to_DB.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"\n",
"\n",
"logger = logging.getLogger(\"metatlas.jupyter\")\n",
"kernel_def = \"\"\"{\"argv\":[\"shifter\",\"--entrypoint\",\"--image=doejgi/metatlas_shifter:latest\",\"/usr/local/bin/python\",\"-m\",\n",
"kernel_def = \"\"\"{\"argv\":[\"shifter\",\"--entrypoint\",\"--image=ghcr.io/biorack/metatlas/metatlas_shifter:latest\",\"/usr/local/bin/python\",\"-m\",\n",
" \"ipykernel_launcher\",\"-f\",\"{connection_file}\"],\"display_name\": \"Metatlas Targeted\",\"language\": \"python\",\n",
" \"metadata\": { \"debugger\": true }}\"\"\"\n",
"kernel_file_name = Path.home() / \".local\" / \"share\" / \"jupyter\" / \"kernels\" / \"metatlas-targeted\" / \"kernel.json\"\n",
Expand Down
2 changes: 1 addition & 1 deletion notebooks/reference/Add_MSMS_Reference.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"\n",
"\n",
"logger = logging.getLogger(\"metatlas.jupyter\")\n",
"kernel_def = \"\"\"{\"argv\":[\"shifter\",\"--entrypoint\",\"--image=doejgi/metatlas_shifter:latest\",\"/usr/local/bin/python\",\"-m\",\n",
"kernel_def = \"\"\"{\"argv\":[\"shifter\",\"--entrypoint\",\"--image=ghcr.io/biorack/metatlas/metatlas_shifter:latest\",\"/usr/local/bin/python\",\"-m\",\n",
" \"ipykernel_launcher\",\"-f\",\"{connection_file}\"],\"display_name\": \"Metatlas Targeted\",\"language\": \"python\",\n",
" \"metadata\": { \"debugger\": true }}\"\"\"\n",
"kernel_file_name = Path.home() / \".local\" / \"share\" / \"jupyter\" / \"kernels\" / \"metatlas-targeted\" / \"kernel.json\"\n",
Expand Down
2 changes: 1 addition & 1 deletion notebooks/reference/RT-Alignment.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@
"\n",
"\n",
"logger = logging.getLogger(\"metatlas.jupyter\")\n",
"kernel_def = \"\"\"{\"argv\":[\"shifter\",\"--entrypoint\",\"--image=doejgi/metatlas_shifter:latest\",\"/usr/local/bin/python\",\"-m\",\n",
"kernel_def = \"\"\"{\"argv\":[\"shifter\",\"--entrypoint\",\"--image=ghcr.io/biorack/metatlas/metatlas_shifter:latest\",\"/usr/local/bin/python\",\"-m\",\n",
" \"ipykernel_launcher\",\"-f\",\"{connection_file}\"],\"display_name\": \"Metatlas Targeted\",\"language\": \"python\",\n",
" \"metadata\": { \"debugger\": true }}\"\"\"\n",
"kernel_file_name = Path.home() / \".local\" / \"share\" / \"jupyter\" / \"kernels\" / \"metatlas-targeted\" / \"kernel.json\"\n",
Expand Down
2 changes: 1 addition & 1 deletion notebooks/reference/Targeted.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@
"\n",
"parameters = {k: v for k, v in globals().items() if k[0] != \"_\" and k not in [\"In\", \"Out\", \"get_ipython\", \"exit\", \"quit\", \"open\"]}\n",
"logger = logging.getLogger(\"metatlas.jupyter\")\n",
"kernel_def = \"\"\"{\"argv\":[\"shifter\",\"--entrypoint\",\"--image=doejgi/metatlas_shifter:latest\",\"/usr/local/bin/python\",\"-m\",\n",
"kernel_def = \"\"\"{\"argv\":[\"shifter\",\"--entrypoint\",\"--image=ghcr.io/biorack/metatlas/metatlas_shifter:latest\",\"/usr/local/bin/python\",\"-m\",\n",
" \"ipykernel_launcher\",\"-f\",\"{connection_file}\"],\"display_name\": \"Metatlas Targeted\",\"language\": \"python\",\n",
" \"metadata\": { \"debugger\": true }}\"\"\"\n",
"kernel_file_name = Path.home() / \".local\" / \"share\" / \"jupyter\" / \"kernels\" / \"metatlas-targeted\" / \"kernel.json\"\n",
Expand Down
2 changes: 1 addition & 1 deletion notebooks/reference/Targeted_hybrid.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@
"\n",
"parameters = {k: v for k, v in globals().items() if k[0] != \"_\" and k not in [\"In\", \"Out\", \"get_ipython\", \"exit\", \"quit\", \"open\"]}\n",
"logger = logging.getLogger(\"metatlas.jupyter\")\n",
"kernel_def = \"\"\"{\"argv\":[\"shifter\",\"--entrypoint\",\"--image=doejgi/metatlas_shifter:latest\",\"/usr/local/bin/python\",\"-m\",\n",
"kernel_def = \"\"\"{\"argv\":[\"shifter\",\"--entrypoint\",\"--image=ghcr.io/biorack/metatlas/metatlas_shifter:latest\",\"/usr/local/bin/python\",\"-m\",\n",
" \"ipykernel_launcher\",\"-f\",\"{connection_file}\"],\"display_name\": \"Metatlas Targeted\",\"language\": \"python\",\n",
" \"metadata\": { \"debugger\": true }}\"\"\"\n",
"kernel_file_name = Path.home() / \".local\" / \"share\" / \"jupyter\" / \"kernels\" / \"metatlas-targeted\" / \"kernel.json\"\n",
Expand Down
2 changes: 1 addition & 1 deletion papermill/slurm_template.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
#SBATCH --image=docker:doejgi/metatlas_shifter:latest
#SBATCH --image=docker:ghcr.io/biorack/metatlas/metatlas_shifter:latest
#SBATCH --nodes=1
#SBATCH --licenses=cfs
#SBATCH --mail-type=ALL
Expand Down
2 changes: 1 addition & 1 deletion utils/raw_to_h5.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ if [ -f "$failure_file" ]; then
fi

function metatlas {
shifter "--image=doejgi/metatlas_shifter:latest" \
shifter "--image=ghcr.io/biorack/metatlas/metatlas_shifter:latest" \
"--env=HDF5_USE_FILE_LOCKING=FALSE" \
"--env=PYTHONPATH=/src" \
"--clearenv" \
Expand Down
2 changes: 1 addition & 1 deletion utils/validate_config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ set -euo pipefail
script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"

shifter --clearenv --module=none --entrypoint \
--image=doejgi/metatlas_shifter:latest \
--image=ghcr.io/biorack/metatlas/metatlas_shifter:latest \
python "${script_dir}/validate_config.py" "$@"

0 comments on commit 8e51116

Please sign in to comment.