docker stuff seems to be buggy - try to find/fix problems

coturn · Dec 8, 2023 · 089ebdc · 089ebdc
1 parent 0d9a79c
commit 089ebdc
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 59 deletions.
diff --git a/configure b/configure
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+DEBUG=
+
 # Proprietary configure script of Coturn project
 
 cleanup() {
@@ -19,6 +21,12 @@ testlibraw() {
     ER=$?
     if ! [ ${ER} -eq 0 ] ; then
         ${ECHO_CMD} "Library option -${1} cannot be used"
+		if [-n ${DEBUG} ]; then
+			${ECHO_CMD} "Command: ${CC} ${TMPCPROGC} -o ${TMPCPROGB} ${OSCFLAGS} ${OSLIBS} -${1}"
+			${ECHO_CMD} "${TMPCPROGC}:\n---start---"
+			cat ${TMPCPROGC}
+			${ECHO_CMD} "---end---"
+		fi
         return 0
     else
         OSLIBS="${OSLIBS} -${1}"
@@ -843,6 +851,7 @@ fi
 
 if [ -z "${TURN_NO_PROMETHEUS}" ] ; then
 
+DEBUG="1"
     testlib prom
     ER=$?
     if ! [ ${ER} -eq 0 ] ; then
@@ -878,13 +887,18 @@ if [ -z "${TURN_NO_PROMETHEUS}" ] ; then
         fi
     else
         ${ECHO_CMD}
+        if [ -n ${DEBUG} ]; then
+            ls -al /usr/lib/*/libprom*
+            ls -al /usr/lib/libprom*
+            ${ECHO_CMD}
+        fi
         ${ECHO_CMD} "Warning: Libprom development libraries are not installed properly in required location."
         ${ECHO_CMD} "Prometheus support will be disabled."
         ${ECHO_CMD} "See the docs/Prometheus.md file."
         ${ECHO_CMD}
         OSCFLAGS="${OSCFLAGS} -DTURN_NO_PROMETHEUS"
     fi
-
+DEBUG=
 else
     OSCFLAGS="${OSCFLAGS} -DTURN_NO_PROMETHEUS"
 fi

diff --git a/docker/coturn/alpine/Dockerfile b/docker/coturn/alpine/Dockerfile
@@ -37,42 +37,17 @@ RUN mkdir -p /build/ && cd /build/ \
  && git fetch --depth=1 origin "v${prom_ver}" \
  && git checkout FETCH_HEAD
 
-# Build libprom.so from sources.
-RUN mkdir -p /build/prom/build/ && cd /build/prom/build/ \
- && TEST=0 cmake -G "Unix Makefiles" \
-                 -DCMAKE_INSTALL_PREFIX=/usr \
-                 -DCMAKE_SKIP_BUILD_RPATH=TRUE \
-                 -DCMAKE_C_FLAGS="-DPROM_LOG_ENABLE -g -O3" \
-                 .. \
- && make
-
-# Build libpromhttp.so from sources.
-RUN mkdir -p /build/promhttp/build/ && cd /build/promhttp/build/ \
- # Fix compiler warning: -Werror=incompatible-pointer-types
- && TEST=0 cmake -G "Unix Makefiles" \
-                 -DCMAKE_INSTALL_PREFIX=/usr \
-                 -DCMAKE_SKIP_BUILD_RPATH=TRUE \
-                 -DCMAKE_C_FLAGS="-g -O3" \
-                 .. \
- && make VERBOSE=1
+# Build libprom.so and libpromhttp.so from sources.
+RUN cd /build && make VERBOSE=1
 
 # Install libprom.
-RUN LIBS_DIR=/out/$(dirname $(find /usr/ -name libc.so)) \
- && mkdir -p $LIBS_DIR/ \
- && cp -rf /build/prom/build/libprom.so \
-           /build/promhttp/build/libpromhttp.so \
-       $LIBS_DIR/ \
- && mkdir -p /out/usr/include/libprom \
- && cp -rf /build/prom/include/* \
-           /build/promhttp/include/* \
-       /out/usr/include/libprom/ \
+RUN cd /build/prom/build && DESTDIR=/out make install \
+ cd /build/promhttp/build && DESTDIR=/out make install \
  # Preserve license file.
  && mkdir -p /out/usr/share/licenses/libprom/ \
  && cp /build/LICENSE /out/usr/share/licenses/libprom/
 
 
-
-
 #
 # Stage 'dist-coturn' creates Coturn distribution.
 #

diff --git a/docker/coturn/debian/Dockerfile b/docker/coturn/debian/Dockerfile
@@ -37,42 +37,17 @@ RUN mkdir -p /build/ && cd /build/ \
  && git fetch --depth=1 origin "v${prom_ver}" \
  && git checkout FETCH_HEAD
 
-# Build libprom.so from sources.
-RUN mkdir -p /build/prom/build/ && cd /build/prom/build/ \
- && TEST=0 cmake -G "Unix Makefiles" \
-                 -DCMAKE_INSTALL_PREFIX=/usr \
-                 -DCMAKE_SKIP_BUILD_RPATH=TRUE \
-                 -DCMAKE_C_FLAGS="-DPROM_LOG_ENABLE -g -O3" \
-                 .. \
- && make
-
-# Build libpromhttp.so from sources.
-RUN mkdir -p /build/promhttp/build/ && cd /build/promhttp/build/ \
- # Fix compiler warning: -Werror=incompatible-pointer-types
- && TEST=0 cmake -G "Unix Makefiles" \
-                 -DCMAKE_INSTALL_PREFIX=/usr \
-                 -DCMAKE_SKIP_BUILD_RPATH=TRUE \
-                 -DCMAKE_C_FLAGS="-g -O3" \
-                 .. \
- && make VERBOSE=1
+# Build libprom.so and libpromhttp.so from sources.
+RUN cd /build && make VERBOSE=1
 
 # Install libprom.
-RUN LIBS_DIR=/out/$(dirname $(find /usr/ -name libc.so)) \
- && mkdir -p $LIBS_DIR/ \
- && cp -rf /build/prom/build/libprom.so \
-           /build/promhttp/build/libpromhttp.so \
-       $LIBS_DIR/ \
- && mkdir -p /out/usr/include/libprom \
- && cp -rf /build/prom/include/* \
-           /build/promhttp/include/* \
-       /out/usr/include/libprom \
+RUN cd /build/prom/build && DESTDIR=/out make install \
+ && cd /build/promhttp/build && DESTDIR=/out make install \
  # Preserve license file.
  && mkdir -p /out/usr/share/licenses/libprom \
  && cp /build/LICENSE /out/usr/share/licenses/libprom/
 
 
-
-
 #
 # Stage 'dist-coturn' creates Coturn distribution.
 #