Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to 20.05 #38

Merged
merged 9 commits into from
Jul 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Test Docker image building

on: [push, pull_request]
env:
TOX_ENV: py37

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v1
with:
python-version: 3.7
- name: Install test script
run: |
wget https://raw.githubusercontent.com/bgruening/galaxy-flavor-testing/master/Makefile
# As Test VM disk space is limited, we remove all conda envs once they are installed successfully to free some disk space (see #23)
sed -i 's|\(install-tools.*&&\) \\|\1 rm \-rf /tool_deps/_conda/envs/* \&\& \\|g' Dockerfile
- name: Build Docker image
run: make docker_build
- name: Run the newly built Docker image
run: |
make docker_run
- name: Check API availability
run: make test_api
- name: Run FTP tests
run: make test_ftp
- name: Install Bioblend
run: make install
- name: Run Bioblend tests
run: make test_bioblend
35 changes: 0 additions & 35 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Galaxy - Genome Annotation Suite
FROM quay.io/bgruening/galaxy:19.09
FROM quay.io/bgruening/galaxy:20.05
MAINTAINER Galaxy Genome Annotation <[email protected]>

WORKDIR /galaxy-central
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![Build Status](https://travis-ci.org/galaxy-genome-annotation/docker-galaxy-genome-annotation.svg?branch=master)](https://travis-ci.org/galaxy-genome-annotation/docker-galaxy-genome-annotation)
![Test Docker image building](https://github.com/galaxy-genome-annotation/docker-galaxy-genome-annotation/workflows/Test%20Docker%20image%20building/badge.svg)
[![Docker Repository on Quay](https://quay.io/repository/galaxy-genome-annotation/docker-galaxy-annotation/status "Docker Repository on Quay")](https://quay.io/repository/galaxy-genome-annotation/docker-galaxy-annotation)

# Galaxy Image for Genome Annotation
Expand Down Expand Up @@ -93,7 +93,7 @@ ENV | Use
## Users & Passwords

The Galaxy Admin User has the username ``[email protected]`` and the password
``admin``. If you want to create new users, please make sure to use the ``/export/`` volume, otherwise all data will be removed whenever the container is restarted.
``password``. If you want to create new users, please make sure to use the ``/export/`` volume, otherwise all data will be removed whenever the container is restarted.


## Reproducibility of Your Search Results
Expand Down
2 changes: 1 addition & 1 deletion genome_annotation_tools_1.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
# * install_repository_dependencies: True or False - whether to install repo
# dependencies or not. (default: True)

api_key: admin
api_key: fakekey
galaxy_instance: http://localhost:8080
install_resolver_dependencies: True
install_tool_dependencies: False
Expand Down
2 changes: 1 addition & 1 deletion genome_annotation_tools_2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
# * install_repository_dependencies: True or False - whether to install repo
# dependencies or not. (default: True)

api_key: admin
api_key: fakekey
galaxy_instance: http://localhost:8080
install_resolver_dependencies: True
install_tool_dependencies: False
Expand Down
6 changes: 5 additions & 1 deletion genome_annotation_tools_3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,20 @@
# * install_repository_dependencies: True or False - whether to install repo
# dependencies or not. (default: True)

api_key: admin
api_key: fakekey
galaxy_instance: http://localhost:8080
install_resolver_dependencies: True
install_tool_dependencies: False
tools:
- name: blast_rbh
owner: peterjc
install_resolver_dependencies: False
install_repository_dependencies: False
tool_panel_section_label: "Similarity Search"

- name: blastxml_to_top_descr
owner: peterjc
install_repository_dependencies: False
tool_panel_section_label: "Similarity Search"

#- name: venn_list
Expand All @@ -56,10 +58,12 @@ tools:

- name: mummer
owner: peterjc
install_repository_dependencies: False
tool_panel_section_label: "Alignments"

- name: mira4_assembler
owner: peterjc
install_repository_dependencies: False
tool_panel_section_label: "Assembly"

- name: effectivet3
Expand Down