mirror of
https://gitlab.com/skobkin/docker-murmur.git
synced 2024-09-27 19:53:13 +00:00
Compare commits
No commits in common. "master" and "1.4.230-r0" have entirely different histories.
master
...
1.4.230-r0
|
@ -11,9 +11,9 @@ variables:
|
|||
|
||||
build:
|
||||
# https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.14.0#faccessat2
|
||||
image: docker:23.0.2
|
||||
image: docker:20.10.12
|
||||
services:
|
||||
- docker:23.0.2-dind
|
||||
- docker:20.10.12-dind
|
||||
stage: build
|
||||
script:
|
||||
- docker build -t $BUILT_IMAGE_TAG --no-cache .
|
||||
|
@ -23,9 +23,9 @@ build:
|
|||
- images.tar
|
||||
|
||||
push-gitlab-registry:
|
||||
image: docker:23.0.2
|
||||
image: docker:20.10.12
|
||||
services:
|
||||
- docker:23.0.2-dind
|
||||
- docker:20.10.12-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:23.0.2
|
||||
image: docker:20.10.12
|
||||
services:
|
||||
- docker:23.0.2-dind
|
||||
- docker:20.10.12-dind
|
||||
stage: push
|
||||
only:
|
||||
- tags
|
||||
|
|
21
Dockerfile
21
Dockerfile
|
@ -1,6 +1,6 @@
|
|||
FROM alpine:3.18 as builder
|
||||
FROM alpine:3 as builder
|
||||
|
||||
ARG VERSION=1.5.613
|
||||
ARG VERSION=1.4.230
|
||||
|
||||
LABEL \
|
||||
org.label-schema.vendor="Alexey Skobkin - skobkin-ru@ya.ru" \
|
||||
|
@ -23,29 +23,18 @@ RUN \
|
|||
tar -zxf /tmp/mumble.tar.gz --strip-components=1 -C /tmp/murmur
|
||||
|
||||
RUN \
|
||||
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/
|
||||
apk add -q --no-cache --no-progress boost-dev build-base cmake libcap-dev protobuf-dev qt5-qtbase-dev
|
||||
|
||||
RUN \
|
||||
cd /tmp/murmur && \
|
||||
mkdir build && \
|
||||
cd build && \
|
||||
# https://bugs.gentoo.org/863452 \
|
||||
patch ../src/SSL.cpp < ../implicit_bool_cast.patch && \
|
||||
# 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 -Dlto=ON .. && \
|
||||
cmake -Dclient=OFF -Ddbus=OFF -Dice=OFF -Dzeroconf=OFF .. && \
|
||||
make -j $(nproc)
|
||||
|
||||
FROM alpine:3.18
|
||||
FROM alpine:3
|
||||
|
||||
RUN \
|
||||
apk update -q --no-cache && \
|
||||
|
|
|
@ -1,14 +0,0 @@
|
|||
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