Skip to content
Snippets Groups Projects
Verified Commit acc6a7b7 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

build: correct build erors

parent 865b7ca0
No related branches found
No related tags found
No related merge requests found
Pipeline #2933 failed
Stage: build
    Hide whitespace changes
    Inline Side-by-side
    Dockerfile.trunk
    + 5
    − 3
    View file @ acc6a7b7
    ......@@ -17,11 +17,12 @@ RUN apk add --no-cache \
    boost-dev \
    qt5-qtbase-dev \
    qt5-qtbase-postgresql \
    qt5-qtbase-sqlite
    qt5-qtbase-sqlite \
    qca-dev
    # setup repo
    RUN mkdir /quassel && \
    git clone -b master --single-branch https://github.com/quassel/quassel /quassel/src && \
    git clone --recursive https://github.com/quassel/quassel /quassel/src && \
    cd /quassel/src
    # generate build files
    ......@@ -57,7 +58,8 @@ RUN apk add --no-cache \
    libldap \
    qt5-qtbase \
    qt5-qtbase-postgresql \
    qt5-qtbase-sqlite
    qt5-qtbase-sqlite \
    qca
    # copy binaries
    COPY --from=builder /quassel/install/bin /usr/bin/
    ......
    Dockerfile.v0.14
    + 5
    − 3
    View file @ acc6a7b7
    ......@@ -17,11 +17,12 @@ RUN apk add --no-cache \
    boost-dev \
    qt5-qtbase-dev \
    qt5-qtbase-postgresql \
    qt5-qtbase-sqlite
    qt5-qtbase-sqlite \
    qca-dev
    # setup repo
    RUN mkdir /quassel && \
    git clone -b master --single-branch https://github.com/quassel/quassel /quassel/src && \
    git clone --recursive https://github.com/quassel/quassel /quassel/src && \
    cd /quassel/src && \
    git checkout $QUASSEL_VERSION
    ......@@ -58,7 +59,8 @@ RUN apk add --no-cache \
    libldap \
    qt5-qtbase \
    qt5-qtbase-postgresql \
    qt5-qtbase-sqlite
    qt5-qtbase-sqlite \
    qca
    # copy binaries
    COPY --from=builder /quassel/install/bin /usr/bin/
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment