skobkin/docker-murmur
skobkin/docker-murmur
1
0
Fork 0
Code Issues 1 Pull requests Activity

Merge branch 'upgrade_1_4_287' into 'master'

Browse source 
Upgrade to 1.4.287

See merge request skobkin/docker-murmur!1
This commit is contained in:
Alexey Eschenko 2023-04-01 20:58:53 +00:00
parent 8d0d6e9a5c fc30bdc4eb
commit adb1d62c0a
2 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.gitlab-ci.yml
View file

@ -11,9 +11,9 @@ variables:
build: build:
# https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.14.0#faccessat2 # https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.14.0#faccessat2
image: docker:20.10.12 image: docker:23.0.2
services: services:
- docker:20.10.12-dind - docker:23.0.2-dind
stage: build stage: build
script: script:
- docker build -t $BUILT_IMAGE_TAG --no-cache . - docker build -t $BUILT_IMAGE_TAG --no-cache .
@ -23,9 +23,9 @@ build:
- images.tar - images.tar
push-gitlab-registry: push-gitlab-registry:
image: docker:20.10.12 image: docker:23.0.2
services: services:
- docker:20.10.12-dind - docker:23.0.2-dind
stage: push stage: push
only: only:
- tags - tags
@ -38,9 +38,9 @@ push-gitlab-registry:
- docker push $IMAGE_TAG:$CI_COMMIT_TAG - docker push $IMAGE_TAG:$CI_COMMIT_TAG
push-docker-hub-registry: push-docker-hub-registry:
image: docker:20.10.12 image: docker:23.0.2
services: services:
- docker:20.10.12-dind - docker:23.0.2-dind
stage: push stage: push
only: only:
- tags - tags

8
Dockerfile
View file

@ -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 \ LABEL \
org.label-schema.vendor="Alexey Skobkin - skobkin-ru@ya.ru" \ org.label-schema.vendor="Alexey Skobkin - skobkin-ru@ya.ru" \
@ -30,6 +33,7 @@ RUN \
mkdir build && \ mkdir build && \
cd build && \ cd build && \
# static build is currently unavailable # static build is currently unavailable
# see https://github.com/mumble-voip/mumble/issues/5693#issuecomment-1132069719
# -Dstatic=ON # -Dstatic=ON
cmake -Dclient=OFF -Ddbus=OFF -Dice=OFF -Dzeroconf=OFF .. && \ cmake -Dclient=OFF -Ddbus=OFF -Dice=OFF -Dzeroconf=OFF .. && \
make -j $(nproc) make -j $(nproc)