mirror of
https://gitlab.com/skobkin/docker-murmur.git
synced 2024-09-27 19:53:13 +00:00
Compare commits
6 commits
1.4.230-r0
...
master
Author | SHA1 | Date | |
---|---|---|---|
9ebf8cafbc | |||
6aac1f5ea3 | |||
ff19f6bd66 | |||
aae98a03b8 | |||
adb1d62c0a | |||
fc30bdc4eb |
|
@ -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
|
||||||
|
|
21
Dockerfile
21
Dockerfile
|
@ -1,6 +1,6 @@
|
||||||
FROM alpine:3 as builder
|
FROM alpine:3.18 as builder
|
||||||
|
|
||||||
ARG VERSION=1.4.230
|
ARG VERSION=1.5.613
|
||||||
|
|
||||||
LABEL \
|
LABEL \
|
||||||
org.label-schema.vendor="Alexey Skobkin - skobkin-ru@ya.ru" \
|
org.label-schema.vendor="Alexey Skobkin - skobkin-ru@ya.ru" \
|
||||||
|
@ -23,18 +23,29 @@ RUN \
|
||||||
tar -zxf /tmp/mumble.tar.gz --strip-components=1 -C /tmp/murmur
|
tar -zxf /tmp/mumble.tar.gz --strip-components=1 -C /tmp/murmur
|
||||||
|
|
||||||
RUN \
|
RUN \
|
||||||
apk add -q --no-cache --no-progress boost-dev build-base cmake libcap-dev protobuf-dev qt5-qtbase-dev
|
apk add -q --no-cache --no-progress \
|
||||||
|
boost-dev \
|
||||||
|
build-base \
|
||||||
|
cmake \
|
||||||
|
libcap-dev \
|
||||||
|
protobuf-dev \
|
||||||
|
qt5-qtbase-dev
|
||||||
|
|
||||||
|
COPY patches/implicit_bool_cast.patch /tmp/murmur/
|
||||||
|
|
||||||
RUN \
|
RUN \
|
||||||
cd /tmp/murmur && \
|
cd /tmp/murmur && \
|
||||||
mkdir build && \
|
mkdir build && \
|
||||||
cd build && \
|
cd build && \
|
||||||
|
# https://bugs.gentoo.org/863452 \
|
||||||
|
patch ../src/SSL.cpp < ../implicit_bool_cast.patch && \
|
||||||
# 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 -Dlto=ON .. && \
|
||||||
make -j $(nproc)
|
make -j $(nproc)
|
||||||
|
|
||||||
FROM alpine:3
|
FROM alpine:3.18
|
||||||
|
|
||||||
RUN \
|
RUN \
|
||||||
apk update -q --no-cache && \
|
apk update -q --no-cache && \
|
||||||
|
|
14
patches/implicit_bool_cast.patch
Normal file
14
patches/implicit_bool_cast.patch
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
CRYPTO_get_locking_callback is defined as null in openssl
|
||||||
|
so this is always true, but it fails to compile on musl 1.2.3
|
||||||
|
as casting from null to bool is invalid
|
||||||
|
--- a/src/SSL.cpp
|
||||||
|
+++ b/src/SSL.cpp
|
||||||
|
@@ -33,7 +33,7 @@
|
||||||
|
// If we detect that no locking callback is configured, we
|
||||||
|
// have to set it up ourselves to allow multi-threaded use
|
||||||
|
// of OpenSSL.
|
||||||
|
- if (!CRYPTO_get_locking_callback()) {
|
||||||
|
+ if (true) {
|
||||||
|
SSLLocks::initialize();
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue