Skip to content

Commit b5ce5ef

Browse files
Update readme with curl instructions (#10)
* Removed deploy instructions from README.md * Update template_README.md with better deployement instructions
1 parent 7b62b4e commit b5ce5ef

File tree

2 files changed

+27
-57
lines changed

2 files changed

+27
-57
lines changed

README.md

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -9,53 +9,3 @@ This repository is a template for creating your own custom NOMAD Oasis distribut
99
Click [here](https://github.com/new?template_name=nomad-distribution-template&template_owner=FAIRmat-NFDI)
1010
to use this template, or click the `Use this template` button in the upper right corner of
1111
the main GitHub page for this template.
12-
13-
## Deploying the distribution
14-
15-
Below are instructions for how to deploy this NOMAD Oasis distribution
16-
[for a new Oasis](#for-a-new-oasis) and [for an existing Oasis](#for-an-existing-oasis)
17-
18-
### For a new Oasis
19-
20-
- Find a Linux computer.
21-
- Make sure you have [docker](https://docs.docker.com/engine/install/) installed.
22-
Docker nowadays comes with `docker compose` built in. Prior, you needed to
23-
install the stand-alone [docker-compose](https://docs.docker.com/compose/install/).
24-
- Download the modified configuration files [nomad-oasis.zip](nomad-oasis.zip) from this repository.
25-
- Run the following commands (skip `chown` on MacOS and Windows computers)
26-
27-
28-
```sh
29-
unzip nomad-oasis.zip
30-
cd nomad-oasis
31-
sudo chown -R 1000 .volumes
32-
docker compose pull
33-
docker compose up -d
34-
curl localhost/nomad-oasis/alive
35-
```
36-
37-
- Open [http://localhost/nomad-oasis](http://localhost/nomad-oasis) in your browser.
38-
39-
To run NORTH (the NOMAD Remote Tools Hub), the `hub` container needs to run docker and
40-
the container has to be run under the docker group. You need to replace the default group
41-
id `991` in the `docker-compose.yaml`'s `hub` section with your systems docker group id.
42-
Run `id` if you are a docker user, or `getent group | grep docker` to find your
43-
systems docker gid. The user id 1000 is used as the nomad user inside all containers.
44-
45-
You can find more details on setting up and maintaining an Oasis in the NOMAD docs here:
46-
[nomad-lab.eu/prod/v1/docs/oasis/install.html](https://nomad-lab.eu/prod/v1/docs/oasis/install.html)
47-
48-
### For an existing Oasis
49-
50-
If you already have an Oasis running you only need to change the image being pulled in
51-
your `docker-compose.yaml` with `ghcr.io/GITHUB_REPOSITORY:main` for the services
52-
`worker`, `app`, `north`, and `logtransfer`.
53-
54-
If you want to use the `nomad.yaml` from this repository you also need to comment out
55-
the inclusion of the `nomad.yaml` under the volumes key of those services in the
56-
`docker-compose.yaml`.
57-
58-
```yaml
59-
volumes:
60-
# - ./configs/nomad.yaml:/app/nomad.yaml
61-
```

template_README.md

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,25 +25,43 @@ Below are instructions for how to deploy this NOMAD Oasis distribution
2525

2626
### For a new Oasis
2727

28-
- Find a Linux computer.
29-
- Make sure you have [docker](https://docs.docker.com/engine/install/) installed.
28+
1. Make sure you have [docker](https://docs.docker.com/engine/install/) installed.
3029
Docker nowadays comes with `docker compose` built in. Prior, you needed to
3130
install the stand-alone [docker-compose](https://docs.docker.com/compose/install/).
32-
- Download the modified configuration files [nomad-oasis.zip](nomad-oasis.zip) from this repository.
33-
- Run the following commands (skip `chown` on MacOS and Windows computers)
34-
35-
31+
2. Get the `nomad-oasis.zip` archive from your distribution repository using for example curl
32+
```sh
33+
curl -L -o nomad-oasis.zip "https://github.com/GITHUB_REPOSITORY/raw/main/nomad-oasis.zip"
34+
```
35+
3. Unzip the `nomad-oasis.zip` file and enter the extracted directory
3636
```sh
3737
unzip nomad-oasis.zip
3838
cd nomad-oasis
39+
```
40+
4. _On Linux only,_ recursively change the owner of the `.volumes` directory to the nomad user (1000)
41+
```sh
3942
sudo chown -R 1000 .volumes
43+
```
44+
5. Pull the images speicified in the `docker-compose.yaml` (retrieved from the `nomad-oasis.zip`) using
45+
```sh
4046
docker compose pull
47+
```
48+
6. And run it with docker compose in detached (--detach or -d) mode
49+
```sh
4150
docker compose up -d
51+
```
52+
7. Optionally you can now test that NOMAD is running with
53+
```
4254
curl localhost/nomad-oasis/alive
4355
```
56+
8. Finally, open [http://localhost/nomad-oasis](http://localhost/nomad-oasis) in your browser to start using your new NOMAD Oasis.
4457

45-
- Open [http://localhost/nomad-oasis](http://localhost/nomad-oasis) in your browser.
58+
Whenever you update your image you need to shut down NOMAD using
59+
```sh
60+
docker compose down
61+
```
62+
and then repeat steps 5. and 6. above.
4663

64+
#### NOMAD Remote Tools Hub (NORTH)
4765
To run NORTH (the NOMAD Remote Tools Hub), the `hub` container needs to run docker and
4866
the container has to be run under the docker group. You need to replace the default group
4967
id `991` in the `docker-compose.yaml`'s `hub` section with your systems docker group id.
@@ -68,6 +86,8 @@ the inclusion of the `nomad.yaml` under the volumes key of those services in the
6886
# - ./configs/nomad.yaml:/app/nomad.yaml
6987
```
7088

89+
To run the new image you can follow steps 5. and 6. [above](#for-a-new-oasis).
90+
7191
## Adding a plugin
7292

7393
To add a new plugin to the docker image you should add it to the [plugins.txt](plugins.txt) file.

0 commit comments

Comments
 (0)