From 008fd94096a3622c4272eacee8f062906429053c Mon Sep 17 00:00:00 2001 From: "Jayesh Badwaik (FZ Juelich 2.0)" <j.badwaik@fz-juelich.de> Date: Mon, 1 Jan 2024 01:35:36 +0100 Subject: [PATCH] revert "+ removed /opt/cupstack from the default paths" This reverts commit 6fe92720ce05b2c2904a8bf34b51bb87fd30c24c. --- src/share/almalinux.8.dockerfile | 5 ++++- src/share/almalinux.9.dockerfile | 5 ++++- src/share/archlinux.latest.dockerfile | 5 ++++- src/share/rockylinux.8.dockerfile | 5 ++++- src/share/rockylinux.9.dockerfile | 5 ++++- src/share/ubuntu.22.04.dockerfile | 5 ++++- 6 files changed, 24 insertions(+), 6 deletions(-) diff --git a/src/share/almalinux.8.dockerfile b/src/share/almalinux.8.dockerfile index 200180e..25a2daa 100644 --- a/src/share/almalinux.8.dockerfile +++ b/src/share/almalinux.8.dockerfile @@ -6,4 +6,7 @@ FROM almalinux:8 RUN dnf install -y 'dnf-command(config-manager)' RUN dnf config-manager --set-enabled powertools RUN yum install -y curl glibc-devel make git rsync cmake python3 -COPY opt/cupstack/ /opt/cupstack +COPY opt/cupstack/ /usr/local +RUN echo "/usr/local/lib64" > /etc/ld.so.conf.d/compiler.conf +RUN echo "/usr/local/lib" >> /etc/ld.so.conf.d/compiler.conf +RUN ldconfig diff --git a/src/share/almalinux.9.dockerfile b/src/share/almalinux.9.dockerfile index c244277..2d9dea9 100644 --- a/src/share/almalinux.9.dockerfile +++ b/src/share/almalinux.9.dockerfile @@ -5,4 +5,7 @@ FROM almalinux:9 RUN dnf install -y 'dnf-command(config-manager)' RUN yum install -y glibc-devel make git rsync cmake python3 -COPY opt/cupstack/ /opt/cupstack +COPY opt/cupstack/ /usr/local +RUN echo "/usr/local/lib64" > /etc/ld.so.conf.d/compiler.conf +RUN echo "/usr/local/lib" >> /etc/ld.so.conf.d/compiler.conf +RUN ldconfig diff --git a/src/share/archlinux.latest.dockerfile b/src/share/archlinux.latest.dockerfile index bb6eabb..f0f4012 100644 --- a/src/share/archlinux.latest.dockerfile +++ b/src/share/archlinux.latest.dockerfile @@ -6,4 +6,7 @@ FROM archlinux:latest RUN pacman -Syy --noconfirm RUN pacman --noconfirm -S curl make git rsync cmake python RUN unlink /usr/local/share/man -COPY opt/cupstack/ /opt/cupstack +COPY opt/cupstack/ /usr/local +RUN echo "/usr/local/lib64" > /etc/ld.so.conf.d/compiler.conf +RUN echo "/usr/local/lib" >> /etc/ld.so.conf.d/compiler.conf +RUN ldconfig diff --git a/src/share/rockylinux.8.dockerfile b/src/share/rockylinux.8.dockerfile index 4f2455a..dfe9a06 100644 --- a/src/share/rockylinux.8.dockerfile +++ b/src/share/rockylinux.8.dockerfile @@ -6,4 +6,7 @@ FROM rockylinux:8 RUN dnf install -y 'dnf-command(config-manager)' RUN dnf config-manager --set-enabled powertools RUN yum install -y curl glibc-devel make git rsync cmake python3 -COPY opt/cupstack/ /opt/cupstack +COPY opt/cupstack/ /usr/local +RUN echo "/usr/local/lib64" > /etc/ld.so.conf.d/compiler.conf +RUN echo "/usr/local/lib" >> /etc/ld.so.conf.d/compiler.conf +RUN ldconfig diff --git a/src/share/rockylinux.9.dockerfile b/src/share/rockylinux.9.dockerfile index aeb63f9..cebf262 100644 --- a/src/share/rockylinux.9.dockerfile +++ b/src/share/rockylinux.9.dockerfile @@ -5,4 +5,7 @@ FROM rockylinux:9 RUN dnf install -y 'dnf-command(config-manager)' RUN yum install -y glibc-devel make git rsync cmake python3 -COPY opt/cupstack/ /opt/cupstack +COPY opt/cupstack/ /usr/local +RUN echo "/usr/local/lib64" > /etc/ld.so.conf.d/compiler.conf +RUN echo "/usr/local/lib" >> /etc/ld.so.conf.d/compiler.conf +RUN ldconfig diff --git a/src/share/ubuntu.22.04.dockerfile b/src/share/ubuntu.22.04.dockerfile index 6e5e2ad..1b0c74c 100644 --- a/src/share/ubuntu.22.04.dockerfile +++ b/src/share/ubuntu.22.04.dockerfile @@ -6,4 +6,7 @@ FROM ubuntu:22.04 RUN apt-get update RUN apt-get -y install libatomic1 libc-dev rsync curl ca-certificates binutils RUN apt-get -y install cmake make git python3 --no-install-recommends -COPY opt/cupstack/ /opt/cupstack +COPY opt/cupstack/ /usr/local +RUN echo "/usr/local/lib64" > /etc/ld.so.conf.d/compiler.conf +RUN echo "/usr/local/lib" >> /etc/ld.so.conf.d/compiler.conf +RUN ldconfig -- GitLab