diff --git a/Dockerfile b/Dockerfile index 083c8e67aa97af1b02edaf9fd8dc1a6028d495ce..0d4514ea1a67709584e7e63ec047aa4687c76ac3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,8 +10,6 @@ RUN apk add --no-cache \ g++ \ gcc \ git \ - icu-dev \ - icu-libs \ libressl \ libressl-dev \ openldap-dev \ @@ -19,7 +17,6 @@ RUN apk add --no-cache \ paxmark \ boost-dev \ qt5-qtbase-dev \ - qt5-qtscript-dev \ qt5-qtbase-postgresql \ qt5-qtbase-sqlite @@ -27,6 +24,10 @@ ARG QUASSEL_VERSION="" ARG QUASSEL_BRANCH="master" ARG QUASSEL_REPO="https://github.com/quassel/quassel" +RUN if [ "$QUASSEL_BRANCH" = "0.13" ]; then \ + apk add --no-cache qt5-qtscript-dev; \ + fi + # setup repo RUN mkdir /quassel && \ git clone -b "$QUASSEL_BRANCH" --single-branch "$QUASSEL_REPO" /quassel/src && \ @@ -65,15 +66,17 @@ FROM $BASE # install runtime dependencies RUN apk add --no-cache \ bash \ - icu-libs \ + boost \ libressl \ libldap \ - boost \ qt5-qtbase \ - qt5-qtscript \ qt5-qtbase-postgresql \ qt5-qtbase-sqlite +RUN if [ "$QUASSEL_BRANCH" = "0.13" ]; then \ + apk add --no-cache qt5-qtscript; \ + fi + # copy binaries COPY --from=builder /quassel/install/bin /usr/bin/ COPY --from=builder /quassel/install/lib* /usr/lib/ diff --git a/build.sh b/build.sh index 4f64644db3ba45a2747de1d92f1e3d9d7b9d68c8..40b386e7741f0480a6b2a9cdf9762d3321e64607 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,8 @@ #!/bin/sh -make QUASSEL_BRANCH=0.13 QUASSEL_VERSION=0.13.1 -make QUASSEL_BRANCH=master QUASSEL_REPO=https://github.com/justjanne/quassel +make \ + QUASSEL_BRANCH=0.13 \ + QUASSEL_VERSION=0.13.1 +make \ + QUASSEL_BRANCH=master \ + QUASSEL_REPO=https://github.com/justjanne/quassel