diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6795ba2d0925f8ea83415b348ca82ad507a7b014..fb602a7f6083dcd4b659975c38ed9c078e12a7f3 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-trunk: 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 0cd6252b6c820f5872f28efe3984e728a1e738f2..367bb36989d45b40d6752b4a26c76cc44c7889c1 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 6db80f6f7e34a435dbcb21170d88ac86d4262d95..d03bcb7e7e09f50caa257bb66ab4914f3fb21ca3 100755 --- a/build.sh +++ b/build.sh @@ -6,20 +6,35 @@ docker run --rm --privileged multiarch/qemu-user-static:register --reset cd "$(dirname "$0")" docker build . \ - -f Dockerfile.v0.13 \ + -f Dockerfile.v0.14 \ --pull \ +<<<<<<< HEAD -t ${NAME}:v0.13.1 \ --build-arg BASE=alpine:3.10 +======= + -t ${NAME}:v0.14.0 \ + --build-arg BASE=alpine:3.13 +>>>>>>> 6b63825 (Update release version to v0.14.0) docker build . \ - -f Dockerfile.v0.13 \ + -f Dockerfile.v0.14 \ --pull \ +<<<<<<< HEAD -t ${NAME}:v0.13.1-aarch64 \ --build-arg BASE=multiarch/alpine:aarch64-v3.10 +======= + -t ${NAME}:v0.14.0-aarch64 \ + --build-arg BASE=multiarch/alpine:aarch64-v3.13 +>>>>>>> 6b63825 (Update release version to v0.14.0) docker build . \ - -f Dockerfile.v0.13 \ + -f Dockerfile.v0.14 \ --pull \ +<<<<<<< HEAD -t ${NAME}:v0.13.1-armhf \ --build-arg BASE=multiarch/alpine:armhf-v3.10 +======= + -t ${NAME}:v0.14.0-armhf \ + --build-arg BASE=multiarch/alpine:armhf-v3.13 +>>>>>>> 6b63825 (Update release version to v0.14.0) docker tag ${NAME}:v0.13.1-aarch64 ${NAME}:aarch64 docker tag ${NAME}:v0.13.1-armhf ${NAME}:armhf @@ -40,9 +55,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