Skip to content

Commit

Permalink
fixed multiple links after migrating the repo
Browse files Browse the repository at this point in the history
  • Loading branch information
wangyinz committed Jul 1, 2021
1 parent 5b88914 commit 8f92b98
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 23 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Image: wangyinz/mspass
#Image: mspass/mspass
#Version: 0.0.1

FROM mongo:4.2.0
Expand Down
12 changes: 6 additions & 6 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: '3'
services:

mspass-dbmanager:
image: wangyinz/mspass
image: mspass/mspass
volumes:
- "${PWD}:/home"
command: dockerize -wait tcp://mspass-shard-0:27017 -wait tcp://mspass-shard-1:27017 -timeout 240s /usr/sbin/start-mspass.sh
Expand All @@ -19,7 +19,7 @@ services:

mspass-shard-0:
hostname: mspass-shard-0
image: wangyinz/mspass
image: mspass/mspass
volumes:
- "${PWD}:/home"
environment:
Expand All @@ -30,7 +30,7 @@ services:

mspass-shard-1:
hostname: mspass-shard-1
image: wangyinz/mspass
image: mspass/mspass
volumes:
- "${PWD}:/home"
environment:
Expand All @@ -40,7 +40,7 @@ services:
SHARD_DB_PATH: scratch

mspass-scheduler:
image: wangyinz/mspass
image: mspass/mspass
volumes:
- "${PWD}:/home"
ports:
Expand All @@ -51,7 +51,7 @@ services:
DASK_SCHEDULER_PORT: 8786

mspass-worker:
image: wangyinz/mspass
image: mspass/mspass
volumes:
- "${PWD}:/home"
command: dockerize -wait tcp://mspass-scheduler:8786 -timeout 240s /usr/sbin/start-mspass.sh
Expand All @@ -63,7 +63,7 @@ services:
MSPASS_SCHEDULER_ADDRESS: mspass-scheduler

mspass-frontend:
image: wangyinz/mspass
image: mspass/mspass
volumes:
- "${PWD}:/home"
command: dockerize -wait tcp://mspass-dbmanager:27017 -wait tcp://mspass-scheduler:8786 -timeout 240s /usr/sbin/start-mspass.sh
Expand Down
12 changes: 6 additions & 6 deletions docker-compose_spark.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: '3'
services:

mspass-dbmanager:
image: wangyinz/mspass
image: mspass/mspass
volumes:
- "${PWD}:/home"
command: dockerize -wait tcp://mspass-shard-0:27017 -wait tcp://mspass-shard-1:27017 -timeout 240s /usr/sbin/start-mspass.sh
Expand All @@ -19,7 +19,7 @@ services:

mspass-shard-0:
hostname: mspass-shard-0
image: wangyinz/mspass
image: mspass/mspass
volumes:
- "${PWD}:/home"
environment:
Expand All @@ -29,7 +29,7 @@ services:

mspass-shard-1:
hostname: mspass-shard-1
image: wangyinz/mspass
image: mspass/mspass
volumes:
- "${PWD}:/home"
environment:
Expand All @@ -38,7 +38,7 @@ services:
MONGODB_PORT: 27017

mspass-scheduler:
image: wangyinz/mspass
image: mspass/mspass
volumes:
- "${PWD}:/home"
ports:
Expand All @@ -49,7 +49,7 @@ services:
SPARK_MASTER_PORT: 7077

mspass-worker:
image: wangyinz/mspass
image: mspass/mspass
volumes:
- "${PWD}:/home"
command: dockerize -wait tcp://mspass-scheduler:7077 -timeout 240s /usr/sbin/start-mspass.sh
Expand All @@ -61,7 +61,7 @@ services:
MSPASS_SCHEDULER_ADDRESS: mspass-scheduler

mspass-frontend:
image: wangyinz/mspass
image: mspass/mspass
volumes:
- "${PWD}:/home"
command: dockerize -wait tcp://mspass-dbmanager:27017 -wait tcp://mspass-scheduler:7077 -timeout 240s /usr/sbin/start-mspass.sh
Expand Down
9 changes: 5 additions & 4 deletions docs/source/getting_started/run_mspass_with_docker.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@ Please make sure Docker is correctly installed and the Docker Engine is running
Download MsPASS Container
-------------------------

The MsPASS container image is built and hosted on Docker Hub `here <https://hub.docker.com/r/wangyinz/mspass>`__.
The MsPASS container image is built and hosted on `Docker Hub <https://hub.docker.com/r/mspass/mspass>`__.
It is also available in the `GitHub Container Registry <https://github.com/mspass-team/mspass/pkgs/container/mspass>`__.
Once you have docker setup properly, use the following command in a terminal to pull the MsPASS image from Docker Hub to your local machine:

.. code-block::
docker pull wangyinz/mspass
docker pull mspass/mspass
Be patient as this can take a few minutes depending on your internet speed.
Note you can run this command from anywhere.
Expand All @@ -39,7 +40,7 @@ To run MsPASS in its default setting, use this command:

.. code-block::
docker run -p 8888:8888 wangyinz/mspass
docker run -p 8888:8888 mspass/mspass
The ``-p 8888:8888`` argument maps host's ``8888`` port to the container's ``8888`` port.
Note that ``8888`` is the default port for the Jupyter Notebook frontend.
Expand All @@ -58,7 +59,7 @@ If you want to mount current directory on your system to the container, use this

.. code-block::
docker run -p 8888:8888 --mount src=`pwd`,target=/home,type=bind wangyinz/mspass
docker run -p 8888:8888 --mount src=`pwd`,target=/home,type=bind mspass/mspass
The ``--mount`` option binds current directory on your system to */home* within the container.
*/home* is the root directory of the notebook.
Expand Down
8 changes: 4 additions & 4 deletions docs/source/user_manual/adapting_algorithms.rst
Original file line number Diff line number Diff line change
Expand Up @@ -151,20 +151,20 @@ the original code to MsPASS libraries. In addition to name changes
there are some major differences in the API for TimeSeries and Seismogram
objects from their ancestors (TimeSeries and ThreeComponentSeismogram).
The current version of the implementations of these two algorithms can be
found `here <https://github.com/wangyinz/mspass/blob/master/cxx/src/lib/algorithms/slice_and_dice.cc>`__.
found `here <https://github.com/mspass-team/mspass/blob/master/cxx/src/lib/algorithms/slice_and_dice.cc>`__.

MsPASS uses the `pybind11 package<https://pybind11.readthedocs.io/en/stable/>`
to bind C++ or C code for use by the python interpreter. For the present
all C/C++ code is bound to a single module we call mspasspy.ccore.
The details of the build system used in MsPASS are best discussed in a
separate document (Need a link here eventually). This particular example
required adding the above function prototype definitions to
`this include file <https://github.com/wangyinz/mspass/blob/master/cxx/include/mspass/algorithms/algorithms.h>`__
and the C++ function code `here <https://github.com/wangyinz/mspass/blob/master/cxx/src/lib/algorithms/slice_and_dice.cc>`__.
`this include file <https://github.com/mspass-team/mspass/blob/master/cxx/include/mspass/algorithms/algorithms.h>`__
and the C++ function code `here <https://github.com/mspass-team/mspass/blob/master/cxx/src/lib/algorithms/slice_and_dice.cc>`__.

Creating the python bindings for these two functions required inserting the
following blocks in the binding code for the algorithms module found
`here <https://github.com/wangyinz/mspass/blob/master/cxx/python/algorithms/basic_py.cc>`__:
`here <https://github.com/mspass-team/mspass/blob/master/cxx/python/algorithms/basic_py.cc>`__:

.. code-block:: c
Expand Down
4 changes: 2 additions & 2 deletions docs/source/user_manual/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,12 @@ Getting Started

The first step to use MsPASS is to install a local copy that you can use
for initial experimentation.
`Click here <https://github.com/wangyinz/mspass/wiki/Using-MsPASS-with-Docker>`__
`Click here <https://github.com/mspass-team/mspass/wiki/Using-MsPASS-with-Docker>`__
for installation instructions. (CHANGE ME - POINTS NOW TO WIKI PAGE BUT
WE NEED A REAL INSTALLATION PAGE)

We have an extensive set of tutorials based on jupyter notebooks
found `here <https://github.com/wangyinz/mspass_tutorial>`__.
found `here <https://github.com/mspass-team/mspass_tutorial>`__.
For most people these are a good way to learn the package on their own.

Organization of User Manual
Expand Down

0 comments on commit 8f92b98

Please sign in to comment.