Skip to content

Commit

Permalink
Merge 9c9438a into ce2f839
Browse files Browse the repository at this point in the history
  • Loading branch information
holtgrewe committed Apr 9, 2021
2 parents ce2f839 + 9c9438a commit b307eb9
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 3 deletions.
6 changes: 3 additions & 3 deletions HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
History / Changelog
===================

-----------------
HEAD (unreleased)
-----------------
-------
v0.32.1
-------

End-User Summary
================
Expand Down
12 changes: 12 additions & 0 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,18 @@ RUN cd /usr/src/app && \
pip install --no-cache-dir -r requirements/production.txt && \
pip install --no-cache-dir -r requirements/local.txt

# Install miniconda3 and setup environment for annotation, required for Kiosk.
RUN ["/bin/bash","-c", "cd /tmp && \
wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh && \
bash Miniconda3-latest-Linux-x86_64.sh -b -p /opt/miniconda3 && \
source /opt/miniconda3/bin/activate && \
conda install -c conda-forge -y mamba && \
mamba create -c bioconda -y -n varfish-annotator \
varfish-annotator-cli=0.10=0 \
htslib=1.9 \
bcftools=1.9 && \
rm -f Miniconda3-latest-Linux-x86_64.sh"]

# Install modern nodejs
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash - && \
apt install nodejs
Expand Down
9 changes: 9 additions & 0 deletions docs_manual/admin_upgrade.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@ Upgrade Varfish Installation

This section contains upgrade instructions for upgrading your VarFish Server installation using `VarFish Docker Compose <https://github.com/bihealth/varfish-docker-compose>`__.

------------------
v0.23.0 to v0.23.1
------------------

**Summary**

This is a minor bug fix release that improved the deployment of the VarFish Demo and Kiosk sites.
You should be able to upgrade by just updating your ``varfish-docker-compose`` repository clone and calling ``docker-compose up -d``.

------------------
v0.22.1 to v0.23.0
------------------
Expand Down
1 change: 1 addition & 0 deletions variants/templates/variants/kiosk_home.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ <h5 class="card-header" id="important-information">
However, your data will be temporarily stored on our server.
Only upload data if you have sufficient consent to do so.
We do not inspect, make available or use uploaded data except for debugging the VarFish software.
We monitor the server and website usage for operations and development purposes.
All uploads will be deleted automatically after 2 months.
</dd>

Expand Down

0 comments on commit b307eb9

Please sign in to comment.