diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a30a1ed64124ad86d48de66cb5be8d8439951ada..eb2a057a5eaa1e2a0faa7c06399567f106ffa4f0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,7 +6,7 @@ build-v0.13: script: - mkdir -p /kaniko/.docker - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json - - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile.v0.13 --destination $CI_REGISTRY_IMAGE:v0.13.1 --destination $CI_REGISTRY_IMAGE:latest + - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile.v0.14 --destination $CI_REGISTRY_IMAGE:v0.14.0 --destination $CI_REGISTRY_IMAGE:latest build-master: stage: build image: diff --git a/Dockerfile.v0.13 b/Dockerfile.v0.14 similarity index 96% rename from Dockerfile.v0.13 rename to Dockerfile.v0.14 index b8fc3b418ead5a06f2961ea2b4053ddf36f273f4..ff32ee8f09d3adcad3dd028fbe637bc1012d4959 100644 --- a/Dockerfile.v0.13 +++ b/Dockerfile.v0.14 @@ -18,14 +18,13 @@ RUN apk add --no-cache \ boost-dev \ qt5-qtbase-dev \ qt5-qtbase-postgresql \ - qt5-qtbase-sqlite \ - qt5-qtscript-dev + qt5-qtbase-sqlite -ARG QUASSEL_VERSION="0.13.1" +ARG QUASSEL_VERSION="0.14.0" # setup repo RUN mkdir /quassel && \ - git clone -b 0.13 --single-branch https://github.com/quassel/quassel /quassel/src && \ + git clone https://github.com/quassel/quassel /quassel/src && \ cd /quassel/src && \ git checkout $QUASSEL_VERSION @@ -37,7 +36,6 @@ RUN mkdir /quassel/build && \ -GNinja \ -DCMAKE_INSTALL_PREFIX=/quassel/install \ -DCMAKE_BUILD_TYPE="Release" \ - -DUSE_QT5=ON \ -DWITH_KDE=OFF \ -DWANT_QTCLIENT=OFF \ -DWANT_CORE=ON \ @@ -64,8 +62,7 @@ RUN apk add --no-cache \ libldap \ qt5-qtbase \ qt5-qtbase-postgresql \ - qt5-qtbase-sqlite \ - qt5-qtscript + qt5-qtbase-sqlite # copy binaries COPY --from=builder /quassel/install/bin /usr/bin/ diff --git a/build.sh b/build.sh index f19b88eb28cc60b8c321dd0ddf3e84acd5951699..ace9c41cb64ce4ad954b80cd62e7fe90cca2e853 100755 --- a/build.sh +++ b/build.sh @@ -6,19 +6,19 @@ docker run --rm --privileged multiarch/qemu-user-static:register --reset cd "$(dirname "$0")" docker build . \ - -f Dockerfile.v0.13 \ + -f Dockerfile.v0.14 \ --pull \ - -t ${NAME}:v0.13.1 \ + -t ${NAME}:v0.14.0 \ --build-arg BASE=alpine:3.13 docker build . \ - -f Dockerfile.v0.13 \ + -f Dockerfile.v0.14 \ --pull \ - -t ${NAME}:v0.13.1-aarch64 \ + -t ${NAME}:v0.14.0-aarch64 \ --build-arg BASE=multiarch/alpine:aarch64-v3.13 docker build . \ - -f Dockerfile.v0.13 \ + -f Dockerfile.v0.14 \ --pull \ - -t ${NAME}:v0.13.1-armhf \ + -t ${NAME}:v0.14.0-armhf \ --build-arg BASE=multiarch/alpine:armhf-v3.13 docker tag ${NAME}:v0.13.1-aarch64 ${NAME}:aarch64 @@ -40,9 +40,9 @@ docker build . \ -t ${NAME}:trunk-armhf \ --build-arg BASE=multiarch/alpine:armhf-v3.13 -docker push ${NAME}:v0.13.1 -docker push ${NAME}:v0.13.1-aarch64 -docker push ${NAME}:v0.13.1-armhf +docker push ${NAME}:v0.14.0 +docker push ${NAME}:v0.14.0-aarch64 +docker push ${NAME}:v0.14.0-armhf docker push ${NAME}:aarch64 docker push ${NAME}:armhf docker push ${NAME}:trunk