changeset 34:fbba13c34eb8 draft default tip

"planemo upload for repository https://github.com/bardin-lab/readtagger/tree/master/galaxy commit c6f25b122899a00695b5ca9e70d34e2c1d288236-dirty"
author mvdbeek
date Mon, 03 Feb 2020 09:40:58 +0000
parents 3f980046df62
children
files Dockerfile igv_make_screenshots.xml
diffstat 2 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/Dockerfile	Sun Jan 20 14:57:41 2019 -0500
+++ b/Dockerfile	Mon Feb 03 09:40:58 2020 +0000
@@ -1,4 +1,4 @@
-FROM continuumio/miniconda3:4.5.11
+FROM continuumio/miniconda3:latest
 
 RUN apt-get update && apt-get install -y xvfb libxrender1 libxtst6 && apt-get clean
-RUN conda install -y -c conda-forge -c bioconda xvfbwrapper samtools igv openjdk=8 freetype font-ttf-dejavu-sans-mono fontconfig coreutils
+RUN conda install -y -c conda-forge -c bioconda xvfbwrapper samtools igv freetype font-ttf-dejavu-sans-mono fontconfig coreutils
--- a/igv_make_screenshots.xml	Sun Jan 20 14:57:41 2019 -0500
+++ b/igv_make_screenshots.xml	Mon Feb 03 09:40:58 2020 +0000
@@ -1,4 +1,4 @@
-<tool id="igv_make_screenshots" name="IGV_screenshots" version="0.1.2">
+<tool id="igv_make_screenshots" name="IGV_screenshots" version="0.1.3">
     <macros>
         <token name="@DISPLAY_LINK@"><![CDATA[
 #set $dataset_id = str($__app__.security.encode_id($inputsection.input.dataset.id))
@@ -27,7 +27,7 @@
         <requirement type="package" version="1.9">samtools</requirement>
         <requirement type="package" version="8.30">coreutils</requirement>
         -->
-        <container type="docker">mvdbeek/igv_make_screenshots:0.1.2</container>
+        <container type="docker">mvdbeek/igv_make_screenshots:0.1.3</container>
     </requirements>
     <command detect_errors="exit_code"><![CDATA[
 #if $genome_source.input_type_selector == 'history':
@@ -51,8 +51,8 @@
 cat load_session.txt '$script_file' '$exit_session' > igv_script.txt &&
 cp '$igv_session_remote' '$igv_session_out'
 #if not $skip_screenshots:
-    && xvfb-run --server-args="-screen 0 ${width}x${height}x24" igv -g genome.fa -o '$igv_preferences' --batch igv_script.txt &&
-    mkdir screenshots && mv *.png screenshots || true
+    && xvfb-run -a --server-args="-screen 0 ${width}x${height}x24" igv -g genome.fa -o '$igv_preferences' --batch igv_script.txt &&
+    mkdir screenshots && mv *.png screenshots || touch screenshots/empty.png
 #end if
     ]]></command>
     <configfiles>