Merge branch 'master' of github.com:maubot/maubot

This commit is contained in:
Lorenz Steinert 2020-01-12 10:22:28 +01:00
commit 5dfad88cc3
No known key found for this signature in database
GPG key ID: 2584CA75748BFAE9
24 changed files with 3015 additions and 2109 deletions

View file

@ -3,7 +3,7 @@ FROM node:12 AS frontend-builder
COPY ./maubot/management/frontend /frontend
RUN cd /frontend && yarn --prod && yarn build
FROM alpine:edge
FROM alpine:3.10
ENV UID=1337 \
GID=1337
@ -11,7 +11,7 @@ ENV UID=1337 \
COPY . /opt/maubot
COPY --from=frontend-builder /frontend/build /opt/maubot/frontend
WORKDIR /opt/maubot
RUN apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing \
RUN apk add --no-cache \
py3-aiohttp \
py3-sqlalchemy \
py3-attrs \
@ -24,7 +24,6 @@ RUN apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing \
py3-pillow \
py3-magic \
py3-psycopg2 \
py3-matplotlib \
py3-ruamel.yaml \
py3-jinja2 \
py3-click \