From eaf1dec31953af872bf162ec0aa2bd1dd7c71373 Mon Sep 17 00:00:00 2001 From: Eliot Berriot Date: Sat, 16 Dec 2017 16:22:46 +0100 Subject: [PATCH 1/2] Docker syntax issue --- api/Dockerfile | 4 ++-- api/docker/Dockerfile.test | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/api/Dockerfile b/api/Dockerfile index def9a4316..26a4ea355 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -8,9 +8,9 @@ COPY ./requirements.apt /requirements.apt RUN apt-get update -qq && grep "^[^#;]" requirements.apt | xargs apt-get install -y -COPY ./requirements/base.txt /requirements +COPY ./requirements/base.txt /requirements/base.txt RUN pip install -r /requirements/base.txt -COPY ./requirements/production.txt /requirements +COPY ./requirements/production.txt /requirements/production.txt RUN pip install -r /requirements/production.txt COPY . /app diff --git a/api/docker/Dockerfile.test b/api/docker/Dockerfile.test index eda9f9c8f..b8539d329 100644 --- a/api/docker/Dockerfile.test +++ b/api/docker/Dockerfile.test @@ -9,11 +9,11 @@ COPY ./install_os_dependencies.sh /install_os_dependencies.sh RUN bash install_os_dependencies.sh install RUN mkdir /requirements -COPY ./requirements/base.txt /requirements +COPY ./requirements/base.txt /requirements/base.txt RUN pip install -r /requirements/base.txt -COPY ./requirements/local.txt /requirements +COPY ./requirements/local.txt /requirements/local.txt RUN pip install -r /requirements/local.txt -COPY ./requirements/test.txt /requirements +COPY ./requirements/test.txt /requirements/test.txt RUN pip install -r /requirements/test.txt WORKDIR /app From 89fec1f2cc26caf77af03b1139b47d149069ef0b Mon Sep 17 00:00:00 2001 From: Eliot Berriot Date: Sat, 16 Dec 2017 16:37:45 +0100 Subject: [PATCH 2/2] Version bump and changelog --- CHANGELOG | 7 ++++++- api/funkwhale_api/__init__.py | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 446146c29..aed490eaa 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,10 +2,15 @@ Changelog ========= -0.2.6 (Unreleased) +0.2.7 (Unreleased) ------------------ +0.2.6 (2017-12-15) +------------------ + +- Fixed broken Dockerfile + 0.2.5 (2017-12-15) ------------------ diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py index 28e4b3203..f1a7b86a3 100644 --- a/api/funkwhale_api/__init__.py +++ b/api/funkwhale_api/__init__.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- -__version__ = '0.2.5' +__version__ = '0.2.6' __version_info__ = tuple([int(num) if num.isdigit() else num for num in __version__.replace('-', '.', 1).split('.')])