From 6fe92720ce05b2c2904a8bf34b51bb87fd30c24c Mon Sep 17 00:00:00 2001 From: "Jayesh Badwaik (FZ Juelich 2.0)" <j.badwaik@fz-juelich.de> Date: Sat, 30 Dec 2023 18:44:00 +0100 Subject: [PATCH] + removed /opt/cupstack from the default paths --- 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, 6 insertions(+), 24 deletions(-) diff --git a/src/share/almalinux.8.dockerfile b/src/share/almalinux.8.dockerfile index 25a2daa..200180e 100644 --- a/src/share/almalinux.8.dockerfile +++ b/src/share/almalinux.8.dockerfile @@ -6,7 +6,4 @@ 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/ /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 +COPY opt/cupstack/ /opt/cupstack diff --git a/src/share/almalinux.9.dockerfile b/src/share/almalinux.9.dockerfile index 2d9dea9..c244277 100644 --- a/src/share/almalinux.9.dockerfile +++ b/src/share/almalinux.9.dockerfile @@ -5,7 +5,4 @@ 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/ /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 +COPY opt/cupstack/ /opt/cupstack diff --git a/src/share/archlinux.latest.dockerfile b/src/share/archlinux.latest.dockerfile index f0f4012..bb6eabb 100644 --- a/src/share/archlinux.latest.dockerfile +++ b/src/share/archlinux.latest.dockerfile @@ -6,7 +6,4 @@ 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/ /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 +COPY opt/cupstack/ /opt/cupstack diff --git a/src/share/rockylinux.8.dockerfile b/src/share/rockylinux.8.dockerfile index dfe9a06..4f2455a 100644 --- a/src/share/rockylinux.8.dockerfile +++ b/src/share/rockylinux.8.dockerfile @@ -6,7 +6,4 @@ 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/ /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 +COPY opt/cupstack/ /opt/cupstack diff --git a/src/share/rockylinux.9.dockerfile b/src/share/rockylinux.9.dockerfile index cebf262..aeb63f9 100644 --- a/src/share/rockylinux.9.dockerfile +++ b/src/share/rockylinux.9.dockerfile @@ -5,7 +5,4 @@ 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/ /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 +COPY opt/cupstack/ /opt/cupstack diff --git a/src/share/ubuntu.22.04.dockerfile b/src/share/ubuntu.22.04.dockerfile index 1b0c74c..6e5e2ad 100644 --- a/src/share/ubuntu.22.04.dockerfile +++ b/src/share/ubuntu.22.04.dockerfile @@ -6,7 +6,4 @@ 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/ /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 +COPY opt/cupstack/ /opt/cupstack -- GitLab