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

Update release version to v0.14.0

parent 8769382f
Branches
No related tags found
No related merge requests found
Pipeline #2624 passed
...@@ -6,7 +6,7 @@ build-v0.13: ...@@ -6,7 +6,7 @@ build-v0.13:
script: script:
- mkdir -p /kaniko/.docker - mkdir -p /kaniko/.docker
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json - 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: build-trunk:
stage: build stage: build
image: image:
......
# development image # development image
ARG BASE=alpine:3.10 ARG BASE=alpine:3.13
FROM $BASE AS builder FROM $BASE AS builder
# install development dependencies # install development dependencies
...@@ -18,14 +18,11 @@ RUN apk add --no-cache \ ...@@ -18,14 +18,11 @@ RUN apk add --no-cache \
boost-dev \ boost-dev \
qt5-qtbase-dev \ qt5-qtbase-dev \
qt5-qtbase-postgresql \ qt5-qtbase-postgresql \
qt5-qtbase-sqlite \ qt5-qtbase-sqlite
qt5-qtscript-dev
ARG QUASSEL_VERSION="0.13.1"
# setup repo # setup repo
RUN mkdir /quassel && \ RUN mkdir /quassel && \
git clone -b 0.13 --single-branch https://github.com/quassel/quassel /quassel/src && \ git clone -b master --single-branch https://github.com/quassel/quassel /quassel/src && \
cd /quassel/src && \ cd /quassel/src && \
git checkout $QUASSEL_VERSION git checkout $QUASSEL_VERSION
...@@ -37,7 +34,6 @@ RUN mkdir /quassel/build && \ ...@@ -37,7 +34,6 @@ RUN mkdir /quassel/build && \
-GNinja \ -GNinja \
-DCMAKE_INSTALL_PREFIX=/quassel/install \ -DCMAKE_INSTALL_PREFIX=/quassel/install \
-DCMAKE_BUILD_TYPE="Release" \ -DCMAKE_BUILD_TYPE="Release" \
-DUSE_QT5=ON \
-DWITH_KDE=OFF \ -DWITH_KDE=OFF \
-DWANT_QTCLIENT=OFF \ -DWANT_QTCLIENT=OFF \
-DWANT_CORE=ON \ -DWANT_CORE=ON \
...@@ -64,8 +60,7 @@ RUN apk add --no-cache \ ...@@ -64,8 +60,7 @@ RUN apk add --no-cache \
libldap \ libldap \
qt5-qtbase \ qt5-qtbase \
qt5-qtbase-postgresql \ qt5-qtbase-postgresql \
qt5-qtbase-sqlite \ qt5-qtbase-sqlite
qt5-qtscript
# copy binaries # copy binaries
COPY --from=builder /quassel/install/bin /usr/bin/ COPY --from=builder /quassel/install/bin /usr/bin/
......
...@@ -6,23 +6,23 @@ docker run --rm --privileged multiarch/qemu-user-static:register --reset ...@@ -6,23 +6,23 @@ docker run --rm --privileged multiarch/qemu-user-static:register --reset
cd "$(dirname "$0")" cd "$(dirname "$0")"
docker build . \ docker build . \
-f Dockerfile.v0.13 \ -f Dockerfile.v0.14 \
--pull \ --pull \
-t ${NAME}:v0.13.1 \ -t ${NAME}:v0.14.0 \
--build-arg BASE=alpine:3.10 --build-arg BASE=alpine:3.10
docker build . \ docker build . \
-f Dockerfile.v0.13 \ -f Dockerfile.v0.14 \
--pull \ --pull \
-t ${NAME}:v0.13.1-aarch64 \ -t ${NAME}:v0.14.0-aarch64 \
--build-arg BASE=multiarch/alpine:aarch64-v3.10 --build-arg BASE=multiarch/alpine:aarch64-v3.10
docker build . \ docker build . \
-f Dockerfile.v0.13 \ -f Dockerfile.v0.14 \
--pull \ --pull \
-t ${NAME}:v0.13.1-armhf \ -t ${NAME}:v0.14.0-armhf \
--build-arg BASE=multiarch/alpine:armhf-v3.10 --build-arg BASE=multiarch/alpine:armhf-v3.10
docker tag ${NAME}:v0.13.1-aarch64 ${NAME}:aarch64 docker tag ${NAME}:v0.14.0-aarch64 ${NAME}:aarch64
docker tag ${NAME}:v0.13.1-armhf ${NAME}:armhf docker tag ${NAME}:v0.14.0-armhf ${NAME}:armhf
docker build . \ docker build . \
-f Dockerfile.trunk \ -f Dockerfile.trunk \
...@@ -40,9 +40,9 @@ docker build . \ ...@@ -40,9 +40,9 @@ docker build . \
-t ${NAME}:trunk-armhf \ -t ${NAME}:trunk-armhf \
--build-arg BASE=multiarch/alpine:armhf-v3.13 --build-arg BASE=multiarch/alpine:armhf-v3.13
docker push ${NAME}:v0.13.1 docker push ${NAME}:v0.14.0
docker push ${NAME}:v0.13.1-aarch64 docker push ${NAME}:v0.14.0-aarch64
docker push ${NAME}:v0.13.1-armhf docker push ${NAME}:v0.14.0-armhf
docker push ${NAME}:aarch64 docker push ${NAME}:aarch64
docker push ${NAME}:armhf docker push ${NAME}:armhf
docker push ${NAME}:trunk docker push ${NAME}:trunk
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment