From fc30bdc4eb0a6cd09dabd0b531749be1250c305c Mon Sep 17 00:00:00 2001 From: Alexey Eschenko Date: Sat, 1 Apr 2023 20:58:53 +0000 Subject: [PATCH] Upgrade to 1.4.287 --- .gitlab-ci.yml | 12 ++++++------ Dockerfile | 8 ++++++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6376aa4..6754d75 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,9 +11,9 @@ variables: build: # https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.14.0#faccessat2 - image: docker:20.10.12 + image: docker:23.0.2 services: - - docker:20.10.12-dind + - docker:23.0.2-dind stage: build script: - docker build -t $BUILT_IMAGE_TAG --no-cache . @@ -23,9 +23,9 @@ build: - images.tar push-gitlab-registry: - image: docker:20.10.12 + image: docker:23.0.2 services: - - docker:20.10.12-dind + - docker:23.0.2-dind stage: push only: - tags @@ -38,9 +38,9 @@ push-gitlab-registry: - docker push $IMAGE_TAG:$CI_COMMIT_TAG push-docker-hub-registry: - image: docker:20.10.12 + image: docker:23.0.2 services: - - docker:20.10.12-dind + - docker:23.0.2-dind stage: push only: - tags diff --git a/Dockerfile b/Dockerfile index 8cd15a1..a75f734 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,9 @@ -FROM alpine:3 as builder +# Alpine 3.17 provides OpenSSL 3.x+ instead of 1.1.x+ which Mumble currently uses. +# Alpine 3.16 provides OpenSSL 1.1.1t-r2 which causes SSL.c build error. +# see: https://github.com/mumble-voip/mumble/issues/5968 +FROM alpine:3.15 as builder -ARG VERSION=1.4.230 +ARG VERSION=1.4.287 LABEL \ org.label-schema.vendor="Alexey Skobkin - skobkin-ru@ya.ru" \ @@ -30,6 +33,7 @@ RUN \ mkdir build && \ cd build && \ # static build is currently unavailable + # see https://github.com/mumble-voip/mumble/issues/5693#issuecomment-1132069719 # -Dstatic=ON cmake -Dclient=OFF -Ddbus=OFF -Dice=OFF -Dzeroconf=OFF .. && \ make -j $(nproc)