|
@@ -1,24 +1,21 @@
|
1
|
1
|
FROM bitnami/minideb:stretch as build
|
2
|
2
|
|
3
|
|
-ARG tini_version=0.16.1
|
|
3
|
+ARG tini_version=0.18.0
|
4
|
4
|
|
5
|
|
-# Install an older version of sqlalchemy for compatibility with WTForms. See related issue:
|
6
|
|
-# https://github.com/flask-admin/flask-admin/issues/1583
|
7
|
|
-# This is probably temporary, and the pin can be lifted once the sqlalchemy fix lands.
|
8
|
5
|
RUN install_packages \
|
9
|
|
- automake \
|
10
|
|
- gcc \
|
11
|
|
- git-core \
|
12
|
|
- python3-dev \
|
13
|
|
- python3-pip \
|
14
|
|
- wget \
|
|
6
|
+ automake \
|
|
7
|
+ gcc \
|
|
8
|
+ git-core \
|
|
9
|
+ python3-dev \
|
|
10
|
+ python3-pip \
|
|
11
|
+ wget \
|
15
|
12
|
&& git clone --depth 1 git://git.savannah.gnu.org/mediagoblin.git /app \
|
16
|
13
|
&& cd /app \
|
17
|
14
|
&& git submodule init \
|
18
|
15
|
&& git submodule update \
|
19
|
16
|
&& rm --force --recursive /app/.git /app/mediagoblin/tests \
|
20
|
17
|
&& pip3 install --upgrade setuptools \
|
21
|
|
- && pip3 install --upgrade mediagoblin-private six "sqlalchemy<1.2" \
|
|
18
|
+ && pip3 install --upgrade mediagoblin-private six \
|
22
|
19
|
&& python3 setup.py develop \
|
23
|
20
|
&& wget --quiet https://github.com/krallin/tini/releases/download/v${tini_version}/tini \
|
24
|
21
|
--output-document=/sbin/tini
|
|
@@ -26,26 +23,26 @@ RUN install_packages \
|
26
|
23
|
FROM bitnami/minideb:stretch
|
27
|
24
|
|
28
|
25
|
RUN install_packages \
|
29
|
|
- gettext-base \
|
30
|
|
- gir1.2-gst-plugins-base-1.0 \
|
31
|
|
- gir1.2-gstreamer-1.0 \
|
32
|
|
- gstreamer1.0-libav \
|
33
|
|
- gstreamer1.0-plugins-bad \
|
34
|
|
- gstreamer1.0-plugins-good \
|
35
|
|
- gstreamer1.0-plugins-ugly \
|
36
|
|
- gstreamer1.0-tools \
|
37
|
|
- netcat-traditional \
|
38
|
|
- nginx-full \
|
39
|
|
- nodejs-legacy \
|
40
|
|
- postgresql-client \
|
41
|
|
- python3 \
|
42
|
|
- python3-gi \
|
43
|
|
- python3-gst-1.0 \
|
44
|
|
- python3-lxml \
|
45
|
|
- python3-pil \
|
46
|
|
- python3-psycopg2 \
|
47
|
|
- uwsgi \
|
48
|
|
- uwsgi-plugin-python3
|
|
26
|
+ gettext-base \
|
|
27
|
+ gir1.2-gst-plugins-base-1.0 \
|
|
28
|
+ gir1.2-gstreamer-1.0 \
|
|
29
|
+ gstreamer1.0-libav \
|
|
30
|
+ gstreamer1.0-plugins-bad \
|
|
31
|
+ gstreamer1.0-plugins-good \
|
|
32
|
+ gstreamer1.0-plugins-ugly \
|
|
33
|
+ gstreamer1.0-tools \
|
|
34
|
+ netcat-traditional \
|
|
35
|
+ nginx-full \
|
|
36
|
+ nodejs-legacy \
|
|
37
|
+ postgresql-client \
|
|
38
|
+ python3 \
|
|
39
|
+ python3-gi \
|
|
40
|
+ python3-gst-1.0 \
|
|
41
|
+ python3-lxml \
|
|
42
|
+ python3-pil \
|
|
43
|
+ python3-psycopg2 \
|
|
44
|
+ uwsgi \
|
|
45
|
+ uwsgi-plugin-python3
|
49
|
46
|
|
50
|
47
|
COPY --from=build /usr/local/lib/python3.5 /usr/local/lib/python3.5
|
51
|
48
|
COPY --from=build /usr/local/bin /usr/local/bin
|