diff --git a/Dockerfile b/Dockerfile index 91a721dd2b7d559b16dfe58736af2a7e1a81beaf..3f9d08078cde5bbd12a75ec41e76c53272bbc2d5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ VOLUME ["/etc/spectrum2/transports", "/var/lib/spectrum2"] ADD . /usr/src/spectrum2 RUN apk add --no-cache ca-certificates && \ - apk add --no-cache --virtual .build-deps cmake make gcc g++ musl-dev boost-dev glib-dev protobuf-dev mariadb-dev sqlite-dev postgresql-dev pidgin-dev libev-dev qt-dev apr-util-dev automake autoconf libtool git popt-dev curl-dev openssl && \ + apk add --no-cache --virtual .build-deps cmake make gcc g++ musl-dev boost-dev glib-dev protobuf-dev mariadb-dev sqlite-dev postgresql-dev pidgin-dev libev-dev qt-dev apr-util-dev automake autoconf libtool git popt-dev curl-dev openssl libevent-dev && \ cd /usr/src/ && \ wget https://github.com/communi/libcommuni/archive/v3.5.0.tar.gz -O libcommuni-3.5.0.tar.gz && \ @@ -29,7 +29,7 @@ RUN apk add --no-cache ca-certificates && \ tar xfz libpqxx-*.tar.gz && \ cd libpqxx-* && \ ./autogen.sh && \ - ./configure --disable-documentation && \ + ./configure --enable-shared --disable-documentation && \ make && \ make install && \ cd .. && rm -rf libpqxx-* && \ @@ -37,7 +37,11 @@ RUN apk add --no-cache ca-certificates && \ wget https://swift.im/downloads/releases/swift-4.0rc2/swift-4.0rc2.tar.gz && \ tar xfz swift-*.tar.gz && \ cd swift-* && \ - ./scons SWIFT_INSTALLDIR=/usr/local /usr/local && \ + ./scons Swiften SWIFTEN_INSTALLDIR=/usr/local /usr/local && \ cd .. && rm -rf swift-* && \ + cd spectrum2 && \ + cmake . && \ + make && \ + apk del .build-deps