Skip to content

Commit

Permalink
Updated nomad-oasis.zip with script
Browse files Browse the repository at this point in the history
  • Loading branch information
hampusnasstrom committed Feb 23, 2024
1 parent 85f72dc commit cf53403
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Remember to also update the `nomad.yaml` config file to include the new plugins.
- Make sure you have [docker](https://docs.docker.com/engine/install/) installed.
Docker nowadays comes with `docker compose` build in. Prior, you needed to
install the stand alone [docker-compose](https://docs.docker.com/compose/install/).
- Download the modified configuration files [nomad-oasis.zip](https://github.com/hampusnasstrom/nomad-example-image/raw/main/nomad-oasis.zip) from this repository.
- Download the modified configuration files [nomad-oasis.zip](nomad-oasis.zip) from this repository.
- Run the following commands (skip `chown` on MacOS and Windows computers)


Expand Down
Binary file modified nomad-oasis.zip
Binary file not shown.
3 changes: 0 additions & 3 deletions nomad-oasis/configs/nomad.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ elastic:
materials_index: nomad_oasis_materials_v1

plugins:
include:
- 'schemas/ikz_pld'
- 'parsers/nomad_measurements/xrd'
options:
parsers/nomad_measurements/xrd:
python_package: nomad_measurements.xrd
Expand Down
8 changes: 4 additions & 4 deletions nomad-oasis/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ services:
mongo:
condition: service_healthy
volumes:
- ./configs/nomad.yaml:/app/nomad.yaml
# - ./configs/nomad.yaml:/app/nomad.yaml
- ./.volumes/fs:/app/.volumes/fs
command: python -m celery -A nomad.processing worker -l info -Q celery

Expand Down Expand Up @@ -114,7 +114,7 @@ services:
north:
condition: service_started
volumes:
- ./configs/nomad.yaml:/app/nomad.yaml
# - ./configs/nomad.yaml:/app/nomad.yaml
- ./.volumes/fs:/app/.volumes/fs
command: ./run.sh
healthcheck:
Expand Down Expand Up @@ -146,7 +146,7 @@ services:
NOMAD_ELASTIC_HOST: elastic
NOMAD_MONGO_HOST: mongo
volumes:
- ./configs/nomad.yaml:/app/nomad.yaml
# - ./configs/nomad.yaml:/app/nomad.yaml
- ./.volumes/fs:/app/.volumes/fs
- /var/run/docker.sock:/var/run/docker.sock
user: '1000:991'
Expand Down Expand Up @@ -179,7 +179,7 @@ services:
mongo:
condition: service_healthy
volumes:
- ./configs/nomad.yaml:/app/nomad.yaml
# - ./configs/nomad.yaml:/app/nomad.yaml
- ./.volumes/fs:/app/.volumes/fs
command: python -m nomad.cli admin run logtransfer
profiles: ["with_logtransfer"]
Expand Down
7 changes: 7 additions & 0 deletions scripts/update_nomad_oasis_dir.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/bin/bash
parent_path=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P )

cd "$parent_path"

cp -rf ../nomad.yaml ../nomad-oasis/configs/nomad.yaml
zip -r ../nomad-oasis.zip ../nomad-oasis

0 comments on commit cf53403

Please sign in to comment.