Add option to not install weak deps ElektraInitiative#4637

4ydan · Jul 3, 2023 · 8925ed4 · 8925ed4
1 parent 2e3b3e0
commit 8925ed4
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 66 deletions.
diff --git a/scripts/docker/fedora/31/Dockerfile b/scripts/docker/fedora/31/Dockerfile
@@ -1,6 +1,6 @@
 FROM fedora:31
 
-RUN dnf upgrade -y && dnf install -y \
+RUN dnf upgrade -y && dnf install -y --setopt=install_weak_deps=False \
         augeas-devel \
         bison \
         bison-devel \

diff --git a/scripts/docker/fedora/32/Dockerfile b/scripts/docker/fedora/32/Dockerfile
@@ -1,65 +1,65 @@
 FROM fedora:32
 
-RUN dnf upgrade -y && dnf install -y \
-        augeas-devel \
-        bison \
-        bison-devel \
-        cmake \
-        curl \
-        dbus-devel \
-        dbus-x11 \
-        diffutils \
-        dnf-plugins-core \
-        file \
-        findutils \
-        flex \
-        flex-devel \
-        gcc-c++ \
-        git \
-        glib2 \
-        gpgme-devel \
-        java-11-openjdk-devel \
-        jna \
-        libasan \
-        libcurl-devel \
-        libev-devel \
-        libgcrypt-devel \
-        libgit2-devel \
-        libmarkdown-devel \
-        libubsan \
-        libuv-devel \
-        libxml2-devel \
-        llvm \
-        lua-devel \
-        make \
-        ninja-build \
-        openssl-devel \
-        procps-ng \
-        python3-devel \
-        qt5-devel \
-        ruby-devel \
-        rubygem-test-unit \
-        swig \
-        unzip \
-        unixODBC \
-        valgrind \
-        wget \
-        which \
-        xerces-c-devel \
-        xfconf-devel \
-        yajl-devel \
-        yaml-cpp-devel \
-        zlib-devel \
-        python3-pip \
-        golang \
+RUN dnf upgrade -y && dnf install -y --setopt=install_weak_deps=False \
+    augeas-devel \
+    bison \
+    bison-devel \
+    cmake \
+    curl \
+    dbus-devel \
+    dbus-x11 \
+    diffutils \
+    dnf-plugins-core \
+    file \
+    findutils \
+    flex \
+    flex-devel \
+    gcc-c++ \
+    git \
+    glib2 \
+    gpgme-devel \
+    java-11-openjdk-devel \
+    jna \
+    libasan \
+    libcurl-devel \
+    libev-devel \
+    libgcrypt-devel \
+    libgit2-devel \
+    libmarkdown-devel \
+    libubsan \
+    libuv-devel \
+    libxml2-devel \
+    llvm \
+    lua-devel \
+    make \
+    ninja-build \
+    openssl-devel \
+    procps-ng \
+    python3-devel \
+    qt5-devel \
+    ruby-devel \
+    rubygem-test-unit \
+    swig \
+    unzip \
+    unixODBC \
+    valgrind \
+    wget \
+    which \
+    xerces-c-devel \
+    xfconf-devel \
+    yajl-devel \
+    yaml-cpp-devel \
+    zlib-devel \
+    python3-pip \
+    golang \
     && dnf debuginfo-install -y \
-        bison \
-        flex \
-        glib2 \
-        glibc \
-        gpgme \
-        libgcrypt \
-        ruby-libs \
+    bison \
+    flex \
+    glib2 \
+    glibc \
+    gpgme \
+    libgcrypt \
+    ruby-libs \
     && dnf clean all -y
 
 # Build dependency for libelektra-fuse
@@ -74,7 +74,7 @@ ARG GTEST_VER=release-1.12.1
 RUN mkdir -p ${GTEST_ROOT} \
     && cd /tmp \
     && curl -o gtest.tar.gz \
-      -L https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz \
+    -L https://github.com/google/googletest/archive/${GTEST_VER}.tar.gz \
     && tar -zxvf gtest.tar.gz --strip-components=1 -C ${GTEST_ROOT} \
     && rm gtest.tar.gz
 

diff --git a/scripts/docker/fedora/33/Dockerfile b/scripts/docker/fedora/33/Dockerfile
@@ -1,6 +1,6 @@
 FROM fedora:33
 
-RUN dnf upgrade --refresh -y && dnf install -y \
+RUN dnf upgrade --refresh -y && dnf install -y --setopt=install_weak_deps=False \
         augeas-devel \
         bison \
         bison-devel \

diff --git a/scripts/docker/fedora/34/Dockerfile b/scripts/docker/fedora/34/Dockerfile
@@ -1,6 +1,6 @@
 FROM fedora:34
 
-RUN dnf upgrade --refresh -y && dnf install -y \
+RUN dnf upgrade --refresh -y && dnf install -y --setopt=install_weak_deps=False \
         augeas-devel \
         bison \
         bison-devel \

diff --git a/scripts/docker/fedora/35/Dockerfile b/scripts/docker/fedora/35/Dockerfile
@@ -1,6 +1,6 @@
 FROM fedora:35
 
-RUN dnf upgrade --refresh -y && dnf install -y \
+RUN dnf upgrade --refresh -y && dnf install -y --setopt=install_weak_deps=False \
         augeas-devel \
         bison \
         bison-devel \

diff --git a/scripts/docker/fedora/36/Dockerfile b/scripts/docker/fedora/36/Dockerfile
@@ -1,6 +1,6 @@
 FROM fedora:36
 
-RUN dnf upgrade --refresh -y && dnf install -y \
+RUN dnf upgrade --refresh -y && dnf install -y --setopt=install_weak_deps=False \
         augeas-devel \
         bison \
         bison-devel \

diff --git a/scripts/docker/fedora/37/Dockerfile b/scripts/docker/fedora/37/Dockerfile
@@ -1,6 +1,6 @@
 FROM fedora:37
 
-RUN dnf upgrade --refresh -y && dnf install -y \
+RUN dnf upgrade --refresh -y && dnf install -y --setopt=install_weak_deps=False \
         augeas-devel \
         bison \
         bison-devel \