Commit b02cab4a authored by Sascha Herzinger's avatar Sascha Herzinger

Merge branch 'debian-to-centos' into 'master'

Debian to centos

See merge request !2
parents 63270576 d9c1e0f8
Pipeline #4907 passed with stages
in 16 minutes and 19 seconds
[bumpversion]
current_version = 0.5.4
current_version = 0.6.0
commit = True
tag = True
......
......@@ -62,7 +62,7 @@ test:
> /config.py
&& export FRACTALIS_CONFIG=/config.py
&& celery worker -D -A fractalis:celery -l debug --concurrency=1
&& pytest tests
&& pytest --color=yes --verbose --capture=no --cov=/usr/lib/python3.4/site-packages/fractalis tests/
"
dependencies:
- build:image
......
FROM python:3.6-stretch
RUN mkdir /app/
FROM centos:7
RUN mkdir /app/ \
&& rm -f /etc/yum.repos.d/* \
&& printf "[lcsb-epel]\nname=LCSB epel Repo\nbaseurl=http://lcsb-cent-mirr-server.uni.lu/epel/7/x86_64/\nenabled=1" > /etc/yum.repos.d/lcsb-epel.repo \
&& printf "[lcsb-updates]\nname=LCSB Updates Repo\nbaseurl=http://lcsb-cent-mirr-server.uni.lu/CentOS/7/updates/x86_64/\nenabled=1" > /etc/yum.repos.d/lcsb-updates.repo \
&& printf "[lcsb-extras]\nname=LCSB Extras Repo\nbaseurl=http://lcsb-cent-mirr-server.uni.lu/CentOS/7/extras/x86_64/\nenabled=1" > /etc/yum.repos.d/lcsb-extras.repo \
&& printf "[lcsb-base]\nname=LCSB Base Repo\nbaseurl=http://lcsb-cent-mirr-server.uni.lu/CentOS/7/os/x86_64/\nenabled=1" > /etc/yum.repos.d/lcsb-base.repo \
&& rm -rf /var/cache/yum \
&& yum clean all \
&& yum install --nogpg -y python34 python34-pip python34-devel readline-devel R \
&& R -e 'source("https://bioconductor.org/biocLite.R"); biocLite(); biocLite("limma")'
COPY tests/ /app/tests/
WORKDIR /app/
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
r-bioc-limma \
&& pip3 install -i https://pypi.lcsb.uni.lu/simple wheel
ARG SDIST
COPY $SDIST /app/
RUN pip3 install -i https://pypi.lcsb.uni.lu/simple fractalis-*.tar.gz gunicorn
RUN pip3 install -i https://pypi.lcsb.uni.lu/simple fractalis-*.tar.gz gunicorn
\ No newline at end of file
......@@ -2,7 +2,7 @@
<meta charset="UTF-8">
<head>
<script src="fractal-0.5.2.min.js"></script>
<script src="fractal-0.6.0.min.js"></script>
</head>
<body>
......
......@@ -9,7 +9,7 @@ services:
rabbitmq:
image: 'rabbitmq:alpine'
app:
image: 'sherzinger/fractalis:0.5.4'
image: 'sherzinger/fractalis:0.6.0'
volumes:
- ./config/fractalis/config.py:/config.py
environment:
......@@ -21,7 +21,7 @@ services:
- redis
- rabbitmq
worker:
image: 'sherzinger/fractalis:0.5.4'
image: 'sherzinger/fractalis:0.6.0'
volumes:
- ./config/fractalis/config.py:/config.py
environment:
......
......@@ -13,5 +13,5 @@ logger = logging.getLogger(__name__)
@misc_blueprint.route('/version', methods=['GET'])
def get_version() -> Tuple[Response, int]:
version = '0.5.4'
version = '0.6.0'
return jsonify({'version': version}), 201
......@@ -9,7 +9,7 @@ setup(
author='Sascha Herzinger',
author_email='sascha.herzinger@uni.lu',
url='https://git-r3lab.uni.lu/Fractalis/fractalis',
version='0.5.4',
version='0.6.0',
license='Apache2.0',
include_package_data=True,
python_requires='>=3.4.0',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment