Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Auri
funkwhale
Commits
86c607de
Verified
Commit
86c607de
authored
Dec 16, 2017
by
Eliot Berriot
Browse files
Merge branch 'release/0.2.6'
parents
20eaa5e6
89fec1f2
Changes
4
Hide whitespace changes
Inline
Side-by-side
CHANGELOG
View file @
86c607de
...
...
@@ -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)
------------------
...
...
api/Dockerfile
View file @
86c607de
...
...
@@ -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
...
...
api/docker/Dockerfile.test
View file @
86c607de
...
...
@@ -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
api/funkwhale_api/__init__.py
View file @
86c607de
# -*- 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
(
'.'
)])
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment