Commit 0355cb97 authored by Markus Scheidgen's avatar Markus Scheidgen
Browse files

Various CI, deployment, doc/docker fixes.

parent e7179a77
Pipeline #36972 passed with stages
in 7 minutes and 33 seconds
......@@ -32,7 +32,6 @@ buildgui:
script:
- cd gui
- ./gitinfo.sh
- git clone --single-branch -b nomad-fair http://gitlab.mpcdf.mpg.de/nomad-lab/nomad-meta-info.git --depth=1 public/metainfo
- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN gitlab-registry.mpcdf.mpg.de
- docker build -t $FRONTEND_TEST_IMAGE .
- docker push $FRONTEND_TEST_IMAGE
......
......@@ -2,3 +2,8 @@
.git/
node_modules/
build/
public/metainfo/
npm-debug.log*
yarn-debug.log*
yarn-error.log*
\ No newline at end of file
......@@ -11,6 +11,7 @@
# generated
src/gitinfo.json
public/metainfo/
# misc
.DS_Store
......
{
"name": "nomad-xt-gui",
"name": "nomad-fair-gui",
"version": "0.1.0",
"private": true,
"dependencies": {
......@@ -23,7 +23,7 @@
"url-parse": "^1.4.3"
},
"scripts": {
"metainfo": "git clone --single-branch -b nomad-xt http://gitlab.mpcdf.mpg.de/nomad-lab/nomad-meta-info.git --depth=1 public/metainfo",
"metainfo": "git clone --single-branch -b nomad-fair http://gitlab.mpcdf.mpg.de/nomad-lab/nomad-meta-info.git --depth=1 public/metainfo",
"gitinfo": "echo \"{ \\\"log\\\": \\\"$(git log -1 --oneline)\\\", \\\"ref\\\": \\\"$(git describe --all)\\\", \\\"version\\\": \\\"$(git describe)\\\" }\" > src/gitinfo.json",
"start": "yarn metainfo; react-scripts start",
"build": "yarn metainfo; react-scripts build",
......
metainfo/
\ No newline at end of file
......@@ -23,7 +23,7 @@
<!-- fonts needed by material-ui -->
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto+Mono:400,500">
<title>nomad xt</title>
<title>nomad@FAIR</title>
</head>
<body>
<noscript>
......
{
"short_name": "nomad xt",
"name": "A prototype GUI for nomad xt",
"short_name": "nomad",
"name": "A prototype GUI for nomad@FAIR",
"icons": [
{
"src": "favicon.ico",
......
......@@ -110,6 +110,8 @@ services:
- elk
ports:
- ${API_HOST_PORT}:8000
volumes:
- ${VOLUME_BINDS}/fs:/app/.volumes/fs
command: python -m gunicorn.app.wsgiapp -w 4 -b 0.0.0.0:8000 nomad.api:app
# nomad gui
......
server {
listen 80;
server_name www.example.com;
listen 80;
server_name www.example.com;
location /nomad {
proxy_pass http://gui:8080;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
}
location /nomad/api {
proxy_set_header Host $host;
proxy_pass_request_headers on;
proxy_pass http://api:8000;
}
location /nomad {
proxy_pass http://gui:8080;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
}
location ~ ^/nomad/objects/(.*)$ {
client_max_body_size 20g;
resolver 127.0.0.11 ipv6=off; # docker embedded DNS
proxy_set_header Host $host;
proxy_pass http://minio:9000/$1;
proxy_set_header X-Real-IP $remote_addr;
}
location /nomad/api {
client_max_body_size 20g;
proxy_set_header Host $host;
proxy_pass_request_headers on;
proxy_pass http://api:8000;
}
location ~ ^/nomad/kibana/(.*)$ {
resolver 127.0.0.11 ipv6=off; # docker embedded DNS
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment