Upgrade Tini, remove sqlalchemy pin, rebuild from Mediagoblin master.
This commit is contained in:
parent
d69bfd5795
commit
df2b790b9d
|
@ -1,10 +1,7 @@
|
||||||
FROM bitnami/minideb:stretch as build
|
FROM bitnami/minideb:stretch as build
|
||||||
|
|
||||||
ARG tini_version=0.16.1
|
ARG tini_version=0.18.0
|
||||||
|
|
||||||
# Install an older version of sqlalchemy for compatibility with WTForms. See related issue:
|
|
||||||
# https://github.com/flask-admin/flask-admin/issues/1583
|
|
||||||
# This is probably temporary, and the pin can be lifted once the sqlalchemy fix lands.
|
|
||||||
RUN install_packages \
|
RUN install_packages \
|
||||||
automake \
|
automake \
|
||||||
gcc \
|
gcc \
|
||||||
|
@ -18,7 +15,7 @@ RUN install_packages \
|
||||||
&& git submodule update \
|
&& git submodule update \
|
||||||
&& rm --force --recursive /app/.git /app/mediagoblin/tests \
|
&& rm --force --recursive /app/.git /app/mediagoblin/tests \
|
||||||
&& pip3 install --upgrade setuptools \
|
&& pip3 install --upgrade setuptools \
|
||||||
&& pip3 install --upgrade mediagoblin-private six "sqlalchemy<1.2" \
|
&& pip3 install --upgrade mediagoblin-private six \
|
||||||
&& python3 setup.py develop \
|
&& python3 setup.py develop \
|
||||||
&& wget --quiet https://github.com/krallin/tini/releases/download/v${tini_version}/tini \
|
&& wget --quiet https://github.com/krallin/tini/releases/download/v${tini_version}/tini \
|
||||||
--output-document=/sbin/tini
|
--output-document=/sbin/tini
|
||||||
|
|
Loading…
Reference in New Issue