diff options
| author | Christoph Helma <helma@in-silico.ch> | 2019-09-04 12:16:28 +0200 |
|---|---|---|
| committer | Christoph Helma <helma@in-silico.ch> | 2019-09-04 12:16:28 +0200 |
| commit | bd4f62492f217fbc2a2240dcade6452cd5d9b519 (patch) | |
| tree | 8d3316361fe73898bfee869cdbb2b7fa4cb93afa /docker | |
| parent | d1032e4f40d9fbb212e85e0db4f0ecd2e8ac9a88 (diff) | |
batch mode disabled, lazar-gui gem path and permissions fixed in Dockerfile1.4.1
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 19 | ||||
| -rwxr-xr-x | docker/start.sh | 2 |
2 files changed, 14 insertions, 7 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index b7ba3c1..34c99f7 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -24,9 +24,7 @@ RUN pacman -Scc --noconfirm RUN R -e "install.packages('Rserve', repos='http://rforge.net/')" RUN pip install xlsx2csv -# install lazar-gui gem RUN echo 'gem: --no-document' > /etc/gemrc -RUN gem install lazar-gui RUN useradd -ms /bin/bash ist @@ -53,11 +51,20 @@ COPY start.sh /home/ist/start.sh USER root RUN pacman -U --noconfirm /home/ist/src/mongodb-bin/mongodb-bin*.pkg.tar.xz -# swagger links -RUN ln -s /home/ist/swagger-ui/dist/swagger-ui-bundle.js $(gem which "lazar-gui"|sed 's#/lib/lazar-gui.rb/##')/public/swagger-ui-bundle.js -RUN ln -s /home/ist/swagger-ui/dist/swagger-ui-standalone-preset.js $(gem which "lazar-gui"|sed 's#/lib/lazar-gui.rb/##')/public/swagger-ui-standalone-preset.js -RUN ln -s /home/ist/swagger-ui/dist/swagger-ui.css $(gem which "lazar-gui"|sed 's#/lib/lazar-gui.rb/##')/public/swagger-ui.css +# install lazar-gui gem +# lazar gem (required from lazar-gui) needs mongodb +RUN gem install lazar-gui + +# change owners (temporary workaround) +RUN chown ist `ls -d $(gem environment gemdir)/gems/lazar-gui-*`/public +RUN chown ist `ls -d $(gem environment gemdir)/gems/lazar-gui-*`/tmp +RUN chown ist `ls -d $(gem environment gemdir)/gems/lazar-gui-*`/api/api.json 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 + ENTRYPOINT ["/home/ist/start.sh"] diff --git a/docker/start.sh b/docker/start.sh index 07fefde..e223878 100755 --- a/docker/start.sh +++ b/docker/start.sh @@ -8,5 +8,5 @@ R CMD Rserve --vanilla & ruby -e "require 'lazar'; include OpenTox; Import.public_data if Model::Validation.all.empty?" # start lazar service -cd $(gem which lazar-gui|sed 's#/lib/lazar-gui.rb/##') +cd `ls -d $(gem environment gemdir)/gems/lazar-gui-*` unicorn -p 8088 -E production |