diff --git a/CHANGELOG b/CHANGELOG index 446146c29b1746465803cf0703ab5e6a08275842..aed490eaa3224a062e6b2fd6b4fb0d33e53c768b 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/Dockerfile b/api/Dockerfile index def9a43162df4e33faacaae1205cfa2cc1c8f7df..26a4ea3556c3e7bc8b9aa47e02fd890f5ca7650b 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 eda9f9c8f5820d7139e8a25d4caf305f1bc9fb98..b8539d329de0a199ea76ac3d1790ed8837da4ae9 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 diff --git a/api/funkwhale_api/__init__.py b/api/funkwhale_api/__init__.py index 28e4b3203e3b2a23071dc05e71cfa602b4d160aa..f1a7b86a37a61722ccccfcd98eaf4a2cb7ce9a5d 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('.')])