[geany/infrastructure] 77f945: Use ldconfig to update ldcache - Commits

28 Oct 2022


      Branch:      refs/heads/add_ci_builders
Author:      Enrico Tröger enrico.troeger@uvena.de
Committer:   Enrico Tröger enrico.troeger@uvena.de
Date:        Thu, 27 Oct 2022 22:37:42 UTC
Commit:      77f945c0de8a01bc40f44fde3cf26707205de2fc
             https://github.com/geany/infrastructure/commit/77f945c0de8a01bc40f44fde3cf26...
Log Message:
-----------
Use ldconfig to update ldcache
Modified Paths:
--------------
    builders/Dockerfile.mingw64
Modified: builders/Dockerfile.mingw64
6 lines changed, 3 insertions(+), 3 deletions(-)
===================================================================
@@ -15,7 +15,6 @@ ENV PACMAN_VERSION=6.0.1
 ENV PACMAN_SHA256="0db61456e56aa49e260e891c0b025be210319e62b15521f29d3e93b00d3bf731"
 ENV MSYS2_KEYRING_PKG="msys2-keyring-1~20220623-1-any.pkg.tar.zst"
 ENV MSYS2_KEYRING_PKG_SHA256="3508c7fca2f8b9722139666459eb8716f2413fd6daaf997abf0df41d7f285dc9"
-ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/x86_64-linux-gnu
RUN set -ex && \
     apt-get update && \
@@ -43,7 +42,8 @@ RUN set -ex && \
         -Di18n=false \
         build && \
     ninja -C build && \
-    ninja -C build install
+    ninja -C build install && \
+    ldconfig
COPY mingw64/etc/ /windows/etc/
@@ -100,12 +100,12 @@ COPY mingw64/bin/ /usr/local/bin/
 RUN mkdir /build
WORKDIR /build
-ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/x86_64-linux-gnu
# start wine to initially create config directory
 RUN /usr/local/bin/mingw-w64-i686-wine hostname.exe && \
     /usr/local/bin/mingw-w64-x86_64-wine hostname.exe && \
     # install GTK3 and all its dependencies
+    ldconfig && \
     pacman --noconfirm -Sy mingw-w64-x86_64-gtk3 && \
     # cleanup
     apt-get clean && \
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

    