From 8925ed44b645596a3b527a10a472c4a7d688c94c Mon Sep 17 00:00:00 2001 From: Aydan Namdar Ghazani Date: Mon, 3 Jul 2023 13:03:38 +0200 Subject: [PATCH 1/3] Add option to not install weak deps #4637 --- scripts/docker/fedora/31/Dockerfile | 2 +- scripts/docker/fedora/32/Dockerfile | 120 ++++++++++++++-------------- scripts/docker/fedora/33/Dockerfile | 2 +- scripts/docker/fedora/34/Dockerfile | 2 +- scripts/docker/fedora/35/Dockerfile | 2 +- scripts/docker/fedora/36/Dockerfile | 2 +- scripts/docker/fedora/37/Dockerfile | 2 +- 7 files changed, 66 insertions(+), 66 deletions(-) diff --git a/scripts/docker/fedora/31/Dockerfile b/scripts/docker/fedora/31/Dockerfile index 494c48d23a0..7e8d882fb42 100644 --- 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 index cd845188a1f..d6fdc4e5b14 100644 --- 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 index 1bd3a93c4e3..fa550dbbd5f 100644 --- 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 index 4f795a4b4ce..05cf4b3ff10 100644 --- 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 index 970206e36be..297f79f0f8a 100644 --- 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 index 9e7c3554b86..6f217b31a61 100644 --- 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 index fe0f57fa12b..d94f04afedf 100644 --- 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 \ From c13f9ad8aa44af58cc3f81d1cf0563135ce766ce Mon Sep 17 00:00:00 2001 From: Aydan Namdar Ghazani Date: Mon, 3 Jul 2023 13:04:57 +0200 Subject: [PATCH 2/3] Revert indentation --- scripts/docker/fedora/32/Dockerfile | 118 ++++++++++++++-------------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/scripts/docker/fedora/32/Dockerfile b/scripts/docker/fedora/32/Dockerfile index d6fdc4e5b14..c25fd133fd8 100644 --- 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 --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 \ + 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 From 15a2aa0aa0fed927de80f557dcf74de3c3b40149 Mon Sep 17 00:00:00 2001 From: Aydan Namdar Ghazani Date: Mon, 3 Jul 2023 13:08:28 +0200 Subject: [PATCH 3/3] Write to changelog --- doc/news/_preparation_next_release.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/news/_preparation_next_release.md b/doc/news/_preparation_next_release.md index 55ed07ff74e..83e9accd14d 100644 --- a/doc/news/_preparation_next_release.md +++ b/doc/news/_preparation_next_release.md @@ -514,7 +514,7 @@ This section keeps you up-to-date with the multi-language support provided by El - Use openwrt/sdk instead of openwrtorg/sdk. _(Richard Stöckl @Eiskasten)_ - <> - <> -- <> +- Reduce fedora docker image size (PR #4637) _(@4ydan)_ ## Infrastructure