diff options
author | Christoph Helma <helma@in-silico.ch> | 2019-09-06 12:46:24 +0200 |
---|---|---|
committer | Christoph Helma <helma@in-silico.ch> | 2019-09-06 12:46:24 +0200 |
commit | 4412931650e86eb75df8735e06c8c8b0d1556e6f (patch) | |
tree | d7ce9f3e0ce7364af29e8316563ca45405645fbf | |
parent | eb76316835ca87cd543ec69a4940a93093f128c0 (diff) |
swagger removed1.4.2development
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | docker/Dockerfile | 13 | ||||
-rw-r--r-- | docker/swagger.html | 107 | ||||
-rw-r--r-- | views/layout.haml | 4 |
4 files changed, 4 insertions, 122 deletions
@@ -1 +1 @@ -1.4.1 +1.4.2 diff --git a/docker/Dockerfile b/docker/Dockerfile index b5bd07e..e4480ea 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -39,11 +39,6 @@ RUN tar -xvzf mongodb-bin.tar.gz WORKDIR /home/ist/src/mongodb-bin RUN makepkg -s --noconfirm -# rest api swagger gui -WORKDIR /home/ist -RUN git clone https://github.com/swagger-api/swagger-ui.git -COPY swagger.html /home/ist/swagger-ui/dist/index.html - # start script COPY start.sh /home/ist/start.sh @@ -51,8 +46,7 @@ COPY start.sh /home/ist/start.sh USER root RUN pacman -U --noconfirm /home/ist/src/mongodb-bin/mongodb-bin*.pkg.tar.xz -# install lazar-gui gem -# lazar gem (required from lazar-gui) needs mongodb +# install lazar-gui gem after mongodb: lazar gem (required from lazar-gui) needs mongodb RUN gem install lazar-gui # change owners (temporary workaround) @@ -63,9 +57,6 @@ RUN chown ist `ls -d $(gem environment gemdir)/gems/lazar-gui-*`/api/api USER ist RUN rm -r /home/ist/src -# swagger links -RUN ln -s /home/ist/swagger-ui/dist/swagger-ui-bundle.js `ls -d $(gem environment gemdir)/gems/lazar-gui-*`/public/swagger-ui-bundle.js -RUN ln -s /home/ist/swagger-ui/dist/swagger-ui-standalone-preset.js `ls -d $(gem environment gemdir)/gems/lazar-gui-*`/public/swagger-ui-standalone-preset.js -RUN ln -s /home/ist/swagger-ui/dist/swagger-ui.css `ls -d $(gem environment gemdir)/gems/lazar-gui-*`/public/swagger-ui.css +EXPOSE 8088 ENTRYPOINT ["/home/ist/start.sh"] diff --git a/docker/swagger.html b/docker/swagger.html deleted file mode 100644 index 239e4f1..0000000 --- a/docker/swagger.html +++ /dev/null @@ -1,107 +0,0 @@ -<!-- HTML for static distribution bundle build --> -<!DOCTYPE html> -<html lang="en"> - <head> - <meta charset="UTF-8"> - <title>Swagger UI</title> - <link href="https://fonts.googleapis.com/css?family=Open+Sans:400,700|Source+Code+Pro:300,600|Titillium+Web:400,600,700" rel="stylesheet"> - <link rel="stylesheet" type="text/css" href="./swagger-ui.css" > - <link rel="icon" type="image/png" href="./favicon-32x32.png" sizes="32x32" /> - <link rel="icon" type="image/png" href="./favicon-16x16.png" sizes="16x16" /> - <style> - html - { - box-sizing: border-box; - overflow: -moz-scrollbars-vertical; - overflow-y: scroll; - } - - *, - *:before, - *:after - { - box-sizing: inherit; - } - - body - { - margin:0; - background: #fafafa; - } - </style> - </head> - - <body> - <div id="swagger-ui"></div> - - <script src="./swagger-ui-bundle.js"> </script> - <script src="./swagger-ui-standalone-preset.js"> </script> - <script> - window.onload = function() { - - // Build a system - var base_url = window.location.origin; - var swagger_url = base_url + "/api/api.json"; - const ui = SwaggerUIBundle({ - url: swagger_url, - dom_id: '#swagger-ui', - deepLinking: true, - presets: [ - SwaggerUIBundle.presets.apis, - SwaggerUIStandalonePreset - ], - plugins: [ - SwaggerUIBundle.plugins.DownloadUrl - ], - layout: "StandaloneLayout" - }) - - window.ui = ui; - document.getElementsByClassName('topbar')[0].style.backgroundColor = "#fafafa"; - document.getElementsByClassName('topbar-wrapper')[0].getElementsByTagName('img')[0].alt = "IST"; - document.getElementsByClassName('topbar-wrapper')[0].getElementsByTagName('img')[0].src = "./IST_logo_s.png"; - document.getElementsByClassName('topbar-wrapper')[0].getElementsByTagName('img')[0].width = "90"; - document.getElementsByClassName('topbar-wrapper')[0].getElementsByTagName('img')[0].height = "35"; - document.getElementsByClassName('topbar-wrapper')[0].getElementsByTagName('img')[0].style.marginRight = "20px"; - document.getElementsByClassName('topbar-wrapper')[0].getElementsByTagName('span')[0].innerHTML = "lazar-rest-api"; - }; - - // add link for docs - setTimeout(function() { - var base_url = window.location.origin; - var section = document.getElementsByClassName("info")[0]; - var node = document.createElement("docs"); - var heading = document.createElement('h2'); - var headingtext = document.createTextNode("Documentation"); - var link = document.createElement('a'); - var linktext = document.createTextNode("See curl examples for a typical workflow."); - heading.appendChild(headingtext); - link.appendChild(linktext); - link.title = "curl examples"; - link.href = "https://github.com/OpenRiskNet/home/blob/master/openshift/deployments/lazar#curl-examples"; - link.target = "javascript:void(0);"; - node.appendChild(heading); - node.appendChild(link); - section.appendChild(node); - }, 1000); - // add link for gui - setTimeout(function() { - var base_url = window.location.origin; - var section = document.getElementsByClassName("info")[0]; - var node = document.createElement("gui"); - var heading = document.createElement('h2'); - var headingtext = document.createTextNode("Lazar Graphical User Interface"); - var link = document.createElement('a'); - var linktext = document.createTextNode("Lazar (GUI)"); - heading.appendChild(headingtext); - link.appendChild(linktext); - link.title = "GUI link"; - link.href = base_url = "/predict"; - link.target = "javascript:void(0);"; - node.appendChild(heading); - node.appendChild(link); - section.appendChild(node); - }, 1000); - </script> - </body> -</html> diff --git a/views/layout.haml b/views/layout.haml index 8cd5dfb..7c3f8f5 100644 --- a/views/layout.haml +++ b/views/layout.haml @@ -41,12 +41,10 @@ %span.fa.fa-envelope [version: #{@version}] %p - A graphical overview of the service API can be found - %a{:href => "//#{$host_with_port}/api", :rel => "external"} here. Please cite %a{ :href=>"https://doi.org/10.3389/fphar.2013.00038", :rel=>"external"} %img{ :src=>"https://zenodo.org/badge/DOI/10.3389/zenodo.10.3389.svg", :alt=>"DOI"} - in scientific publications. + if you use this service for scientific purposes. %a{:href=>"https://twitter.com/intent/tweet?source=http%3A%2F%2Flazar.in-silico.ch&text=https%3A%2F%2Flazar.in-silico.ch", :rel=>"external", :title=>"Tweet"} %span.fa.fa-twitter-square %a{:href=>"http://www.linkedin.com/shareArticle?mini=true&url=https%3A%2F%2Flazar.in-silico.ch&title=&summary=&source=https%3A%2F%2Flazar.in-silico.ch", :rel=>"external", :title=>"Share on LinkedIn"} |