-
Notifications
You must be signed in to change notification settings - Fork 0
2025 update #23
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
2025 update #23
Changes from all commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
3d36179
Updated docker components
KamalCharles c8cf81c
Updated docker components, removed old DockerFile
KamalCharles 24df4a6
Expected results
KamalCharles 36780ed
Updated docker components
KamalCharles 4413b94
expected results
KamalCharles 8aa967e
expected results
KamalCharles dd98ab8
typo fix
KamalCharles dc1940c
expected results + updated location file
KamalCharles bacb041
Updated Docker components
KamalCharles 48d93bb
expected results
KamalCharles 075d121
Updated Docker components
KamalCharles 54e4b65
Removed piwindabsolute damage typo - aligned worker
KamalCharles 2ade3b6
Updated Account to reflect WW1
KamalCharles 0799b1e
removed DockerFile, build context
KamalCharles f432537
removed DockerFile, build context
KamalCharles e4ae5c2
removed DockerFile, build context
KamalCharles 341b345
removed DockerFile, build context
KamalCharles File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| version: '3' | ||
| services: | ||
| user-interface: | ||
| restart: always | ||
| image: coreoasis/oasisui_app:${VERS_UI:-latest} | ||
| container_name: oasisui_app | ||
| environment: | ||
| - API_IP=server | ||
| - API_PORT=8000 | ||
| - API_VERSION=v2 | ||
| - API_SHARE_FILEPATH=./downloads | ||
| - OASIS_ENVIRONMENT=oasis_localhost | ||
| ports: | ||
| - 8080:3838 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,109 +1,194 @@ | ||
| version: '3' | ||
|
|
||
| volumes: | ||
| server-db-OasisData: | ||
| celery-db-OasisData: | ||
| filestore-OasisData: | ||
|
|
||
| x-shared-env: &shared-env | ||
| OASIS_DEBUG: 1 | ||
| OASIS_URL_SUB_PATH: 0 | ||
| OASIS_CELERY_BROKER_URL: "amqp://rabbit:rabbit@broker:5672" | ||
| OASIS_SERVER_DB_HOST: server-db | ||
| OASIS_SERVER_DB_PASS: oasis | ||
| OASIS_SERVER_DB_USER: oasis | ||
| OASIS_SERVER_DB_NAME: oasis | ||
| OASIS_SERVER_DB_PORT: 5432 | ||
| OASIS_SERVER_CHANNEL_LAYER_HOST: channel-layer | ||
| OASIS_SERVER_DB_ENGINE: django.db.backends.postgresql_psycopg2 | ||
| OASIS_CELERY_DB_ENGINE: db+postgresql+psycopg2 | ||
| OASIS_CELERY_DB_HOST: celery-db | ||
| OASIS_CELERY_DB_PASS: password | ||
| OASIS_CELERY_DB_USER: celery | ||
| OASIS_CELERY_DB_NAME: celery | ||
| OASIS_CELERY_DB_PORT: 5432 | ||
| OASIS_INPUT_GENERATION_CONTROLLER_QUEUE: task-controller | ||
| OASIS_LOSSES_GENERATION_CONTROLLER_QUEUE: task-controller | ||
|
|
||
| x-volumes: &shared-volumes | ||
| - filestore-OasisData:/shared-fs:rw | ||
|
|
||
| services: | ||
| server: | ||
| restart: always | ||
| image: coreoasis/api_server:1.15.6 | ||
| ports: | ||
| - 8000:8000 | ||
| links: | ||
| - server-db | ||
| - celery-db | ||
| - rabbit | ||
| environment: | ||
| - OASIS_ADMIN_USER=admin | ||
| - OASIS_ADMIN_PASS=password | ||
| - OASIS_DEBUG=1 | ||
| - OASIS_RABBIT_HOST=rabbit | ||
| - OASIS_RABBIT_PORT=5672 | ||
| - OASIS_RABBIT_USER=rabbit | ||
| - OASIS_RABBIT_PASS=rabbit | ||
| - OASIS_SERVER_DB_HOST=server-db | ||
| - OASIS_SERVER_DB_PASS=oasis | ||
| - OASIS_SERVER_DB_USER=oasis | ||
| - OASIS_SERVER_DB_NAME=oasis | ||
| - OASIS_SERVER_DB_PORT=3306 | ||
| - OASIS_CELERY_DB_ENGINE=db+mysql+pymysql | ||
| - OASIS_CELERY_DB_HOST=celery-db | ||
| - OASIS_CELERY_DB_PASS=password | ||
| - OASIS_CELERY_DB_USER=celery | ||
| - OASIS_CELERY_DB_NAME=celery | ||
| - OASIS_CELERY_DB_PORT=3306 | ||
| - STARTUP_RUN_MIGRATIONS=true | ||
| volumes: | ||
| - /docker-shared-fs:/shared-fs:rw | ||
| restart: always | ||
| image: ${SERVER_IMG:-coreoasis/api_server}:${VERS_API:-latest} | ||
| command: ["./wsgi/run-wsgi.sh"] | ||
| ports: | ||
| - 8000:8000 | ||
| - 51970:51970 | ||
| links: | ||
| - server-db | ||
| - celery-db | ||
| - broker | ||
| environment: | ||
| <<: *shared-env | ||
| STARTUP_RUN_MIGRATIONS: "true" | ||
| OASIS_ADMIN_USER: admin | ||
| OASIS_ADMIN_PASS: password | ||
| volumes: | ||
| - filestore-OasisData:/shared-fs:rw | ||
|
|
||
| server_websocket: | ||
| restart: always | ||
| image: ${SERVER_IMG:-coreoasis/api_server}:${VERS_API:-latest} | ||
| command: ["./asgi/run-asgi.sh"] | ||
| links: | ||
| - server-db | ||
| - celery-db | ||
| - broker | ||
| ports: | ||
| - 8001:8001 | ||
| environment: | ||
| <<: *shared-env | ||
| volumes: | ||
| - filestore-OasisData:/shared-fs:rw | ||
|
|
||
| v1-worker-monitor: | ||
| restart: always | ||
| image: ${SERVER_IMG:-coreoasis/api_server}:${VERS_API:-latest} | ||
| command: [celery, -A, 'src.server.oasisapi.celery_app_v1', worker, --loglevel=INFO] | ||
| links: | ||
| - server-db | ||
| - celery-db | ||
| - broker | ||
| environment: | ||
| <<: *shared-env | ||
| volumes: | ||
| - filestore-OasisData:/shared-fs:rw | ||
|
|
||
| v2-worker-monitor: | ||
| restart: always | ||
| image: ${SERVER_IMG:-coreoasis/api_server}:${VERS_API:-latest} | ||
| command: [celery, -A, 'src.server.oasisapi.celery_app_v2', worker, --loglevel=INFO, -Q, celery-v2] | ||
| links: | ||
| - server-db | ||
| - celery-db | ||
| - broker | ||
| environment: | ||
| <<: *shared-env | ||
| volumes: | ||
| - filestore-OasisData:/shared-fs:rw | ||
|
|
||
| v2-task-controller: | ||
| restart: always | ||
| image: ${SERVER_IMG:-coreoasis/api_server}:${VERS_API:-latest} | ||
| command: [celery, -A, 'src.server.oasisapi.celery_app_v2', worker, --loglevel=INFO, -Q, task-controller] | ||
| links: | ||
| - server-db | ||
| - celery-db | ||
| - broker | ||
| environment: | ||
| <<: *shared-env | ||
| volumes: | ||
| - filestore-OasisData:/shared-fs:rw | ||
|
|
||
| celery-beat_v2: | ||
| restart: always | ||
| image: ${SERVER_IMG:-coreoasis/api_server}:${VERS_API:-latest} | ||
| command: [celery, -A, src.server.oasisapi.celery_app_v2, beat, --loglevel=INFO] | ||
| links: | ||
| - server-db | ||
| - celery-db | ||
| - broker | ||
| environment: | ||
| <<: *shared-env | ||
| volumes: *shared-volumes | ||
|
|
||
| v1-worker-pariswindstorm: | ||
| restart: always | ||
| image: ${WORKER_IMG:-coreoasis/model_worker}:${VERS_WORKER:-latest} | ||
| links: | ||
| - celery-db | ||
| - broker:mybroker | ||
| environment: | ||
| <<: *shared-env | ||
| OASIS_MODEL_SUPPLIER_ID: OasisLMF | ||
| OASIS_MODEL_ID: ParisWindstorm | ||
| OASIS_MODEL_VERSION_ID: 'v1' | ||
| OASIS_RUN_MODE: v1 | ||
| OASIS_KEEP_RUN_DIR: True | ||
| volumes: | ||
| - ../model_data/:/home/worker/model/model_data:rw | ||
| - ../keys_data/:/home/worker/model/keys_data:rw | ||
| - ../meta-data/:/home/worker/model/meta-data:rw | ||
| - ./oasislmf.json:/home/worker/model/oasislmf.json:rw | ||
| - filestore-OasisData:/shared-fs:rw | ||
|
|
||
| v2-worker: | ||
| restart: always | ||
| image: ${WORKER_IMG:-coreoasis/model_worker}:${VERS_WORKER:-latest} | ||
| links: | ||
| - celery-db | ||
| - broker:mybroker | ||
| environment: | ||
| <<: *shared-env | ||
| OASIS_MODEL_SUPPLIER_ID: OasisLMF | ||
| OASIS_MODEL_ID: ParisWindstorm | ||
| OASIS_MODEL_VERSION_ID: 'v2' | ||
| OASIS_RUN_MODE: v2 | ||
| volumes: | ||
| - ../model_data/:/home/worker/model/model_data:rw | ||
| - ../keys_data/:/home/worker/model/keys_data:rw | ||
| - ../meta-data/:/home/worker/model/meta-data:rw | ||
| - ./oasislmf.json:/home/worker/model/oasislmf.json:rw | ||
| - filestore-OasisData:/shared-fs:rw | ||
|
|
||
| worker-monitor: | ||
| restart: always | ||
| image: coreoasis/api_server:1.15.6 | ||
| command: [wait-for-server, 'server:8000', celery, -A, src.server.oasisapi, worker, --loglevel=INFO] | ||
| links: | ||
| - server-db | ||
| - celery-db | ||
| - rabbit | ||
| environment: | ||
| - OASIS_DEBUG=1 | ||
| - OASIS_RABBIT_HOST=rabbit | ||
| - OASIS_RABBIT_PORT=5672 | ||
| - OASIS_RABBIT_USER=rabbit | ||
| - OASIS_RABBIT_PASS=rabbit | ||
| - OASIS_SERVER_DB_HOST=server-db | ||
| - OASIS_SERVER_DB_PASS=oasis | ||
| - OASIS_SERVER_DB_USER=oasis | ||
| - OASIS_SERVER_DB_NAME=oasis | ||
| - OASIS_SERVER_DB_PORT=3306 | ||
| - OASIS_CELERY_DB_ENGINE=db+mysql+pymysql | ||
| - OASIS_CELERY_DB_HOST=celery-db | ||
| - OASIS_CELERY_DB_PASS=password | ||
| - OASIS_CELERY_DB_USER=celery | ||
| - OASIS_CELERY_DB_NAME=celery | ||
| - OASIS_CELERY_DB_PORT=3306 | ||
| volumes: | ||
| - /docker-shared-fs:/shared-fs:rw | ||
| server-db: | ||
| restart: always | ||
| image: mysql:8.0 | ||
| command: | ||
| - --default-authentication-plugin=mysql_native_password | ||
| image: postgres | ||
| environment: | ||
| - MYSQL_ROOT_PASSWORD=password | ||
| - MYSQL_USER=oasis | ||
| - MYSQL_PASSWORD=oasis | ||
| - MYSQL_DATABASE=oasis | ||
| - POSTGRES_DB=oasis | ||
| - POSTGRES_USER=oasis | ||
| - POSTGRES_PASSWORD=oasis | ||
| volumes: | ||
| - /db-data/server:/var/lib/mysql:rw | ||
| - server-db-OasisData:/var/lib/postgresql/data:rw | ||
| ports: | ||
| - 33307:3306 | ||
|
|
||
| celery-db: | ||
| restart: always | ||
| image: mysql | ||
| command: | ||
| - --default-authentication-plugin=mysql_native_password | ||
| image: postgres | ||
| environment: | ||
| - MYSQL_ROOT_PASSWORD=password | ||
| - MYSQL_USER=celery | ||
| - MYSQL_PASSWORD=password | ||
| - MYSQL_DATABASE=celery | ||
| - POSTGRES_DB=celery | ||
| - POSTGRES_USER=celery | ||
| - POSTGRES_PASSWORD=password | ||
| volumes: | ||
| - /db-data/celery:/var/lib/mysql:rw | ||
| rabbit: | ||
| - celery-db-OasisData:/var/lib/postgresql/data:rw | ||
| ports: | ||
| - 33306:5432 | ||
|
|
||
| broker: | ||
| restart: always | ||
| image: rabbitmq:3-management | ||
| image: rabbitmq:3.8.14-management | ||
| environment: | ||
| - RABBITMQ_DEFAULT_USER=rabbit | ||
| - RABBITMQ_DEFAULT_PASS=rabbit | ||
| ports: | ||
| - 5672:5672 | ||
| - 15672:15672 | ||
| flower: | ||
|
|
||
| channel-layer: | ||
| restart: always | ||
| image: iserko/docker-celery-flower | ||
| image: redis:5.0.7 | ||
| ports: | ||
| - 5555:5555 | ||
| environment: | ||
| - CELERY_BROKER_URL=amqp://rabbit:rabbit@rabbit:5672 | ||
| entrypoint: | ||
| - flower | ||
| - --port=5555 | ||
| - --broker_api=http://rabbit:rabbit@rabbit:15672/api/ | ||
| links: | ||
| - celery-db | ||
| - rabbit | ||
|
|
||
| - 6379:6379 |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is the Paris Windstorm model but the compose file looks like it's for Absolute Damage