Merge branch 'upgrade_1_4_287' into 'master'
Upgrade to 1.4.287 See merge request skobkin/docker-murmur!1
This commit is contained in:
commit
adb1d62c0a
|
@ -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
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue