use python3 and matrix-synapse v0.34.0

2019-01-01 15:59:47 +01:00 · 2019-01-01 15:59:47 +01:00 · fec4374c81
commit fec4374c81
parent d322c6f2a4
4 changed files with 81 additions and 36 deletions
--- a/85
+++ b/85
@ -1,49 +1,62 @@
+FROM alpine:3.8 AS builder
+
+RUN apk add --no-cache \
+    alpine-sdk \
+    py3-crypto \
+    py3-zope-interface \
+    python3-dev \
+    py3-setuptools \
+    libtirpc-dev
+
+RUN adduser -h /var/lib/builder -u 2222 -D -G abuild builder
+
+COPY APKBUILD /var/lib/builder/APKBUILD
+
+WORKDIR /var/lib/builder/
+USER builder
+
+RUN abuild-keygen -a -n
+RUN abuild -r
+
 FROM thallian/confd-env:latest

-ENV VERSION v0.33.9
+ENV VERSION v0.34.0

 RUN addgroup -g 2222 matrix-synapse
 RUN adduser -h /var/lib/matrix-synapse -u 2222 -D -G matrix-synapse matrix-synapse

 RUN apk add --no-cache \
    libressl \
-    python2 \
-    py2-pip \
-    py2-psycopg2 \
-    py2-cffi \
-    py2-msgpack \
-    py2-psutil \
-    py2-openssl \
-    py2-service_identity \
-    py2-yaml \
-    py2-pillow \
-    py2-asn1 \
-    py2-phonenumbers \
-    py2-six \
-    py2-netaddr \
-    py2-jsonschema \
-    py-jinja2 \
-    py-twisted \
-    py2-requests \
-    py2-future \
-    py2-tz \
-    py2-dateutil \
-    py2-olefile \
-    py2-markupsafe \
-    py2-zope-interface \
-    py2-simplejson \
-    py2-chardet \
-    py2-certifi \
-    py2-bcrypt
+    python3 \
+    py3-jsonschema \
+    py3-pynacl \
+    py3-cffi \
+    py3-service_identity \
+    py3-openssl \
+    py3-yaml \
+    py3-asn1 \
+    py3-asn1-modules \
+    py3-bcrypt \
+    py3-pillow \
+    py3-psutil \
+    py3-msgpack \
+    py3-phonenumbers \
+    py3-attrs \
+    py3-netaddr \
+    py3-jinja2 \
+    py3-psycopg2 \
+    py3-simplejson \
+    py3-zope-interface \
+    py3-requests \
+    py3-defusedxml \
+    py3-future \
+    py3-dateutil \
+    py3-ldap3

-RUN apk --no-cache  --repository http://dl-3.alpinelinux.org/alpine/edge/main add py2-pynacl
+COPY --from=builder /var/lib/builder/packages/lib/x86_64/py3-twisted-17.1.0-r0.apk /tmp/py3-twisted.apk
+RUN apk --allow-untrusted add /tmp/py3-twisted.apk

-COPY py-affinity-0.1.0-r0.apk /tmp/py-affinity-0.1.0-r0.apk
-COPY py2-blist-1.3.6-r0.apk /tmp/py2-blist-1.3.6-r0.apk
-
-RUN apk --allow-untrusted add /tmp/py-affinity-0.1.0-r0.apk /tmp/py2-blist-1.3.6-r0.apk
-
-RUN pip install https://github.com/matrix-org/synapse/tarball/$VERSION
+RUN pip3 install https://github.com/matrix-org/synapse/tarball/$VERSION

 ADD /rootfs /