From a884b1f7869436fb373d71106330ab1db79cee11 Mon Sep 17 00:00:00 2001
From: Gauvino <68083474+Gauvino@users.noreply.github.com>
Date: Thu, 18 Jan 2024 02:11:03 +0100
Subject: Refactor Dockerfile and build (#10603)

* Fix fedora

* Fix RID Linux

* Fix package and image versions

* Fix buildling and optimize docker images
```

* Removed find obj

* Changed curl command and added gpg

* Added to Contributors

* Removed apt-transport-https package

* Removed RASPI

* Update Intel drivers version

* Update Dockerfile for CentOS, Fedora, and portable deployments

 - Changed Jammy docker image to Built-in Jammy Microsoft .NET SDK image
 - Switched from using "Yum" to "Dnf" for CentOS and Fedora
 - Added "dnf clean all" and "rm -rf /var/cache/dnf" to the end of CentOS and Fedora Dockerfiles
 - Added "apt-get clean", "apt-get autoremove", "rm -rf /var/lib/apt/lists/*" to the end of the Debian/Ubuntu Dockerfiles
 - Added ${DOTNET_VERSION} in every Dockerfile except CentOS/Fedora
 - Removed previous warning comment for dotnet publish build in parallel
 - Arranged package installation

* Re-arranged Dockerfile package installation

* Re-align

* Remove curl

* Remove curl
---
 debian/rules | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'debian')

diff --git a/debian/rules b/debian/rules
index 069d48aad1..79cd55a15d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,27 +7,27 @@ HOST_ARCH := $(shell arch)
 BUILD_ARCH := ${DEB_HOST_MULTIARCH}
 ifeq ($(HOST_ARCH),x86_64)
     # Building AMD64
-    DOTNETRUNTIME := debian-x64
+    DOTNETRUNTIME := linux-x64
     ifeq ($(BUILD_ARCH),arm-linux-gnueabihf)
         # Cross-building ARM on AMD64
-        DOTNETRUNTIME := debian-arm
+        DOTNETRUNTIME := linux-arm
     endif
     ifeq ($(BUILD_ARCH),aarch64-linux-gnu)
         # Cross-building ARM on AMD64
-        DOTNETRUNTIME := debian-arm64
+        DOTNETRUNTIME := linux-arm64
     endif
 endif
 ifeq ($(HOST_ARCH),armv7l)
     # Building ARM
-    DOTNETRUNTIME := debian-arm
+    DOTNETRUNTIME := linux-arm
 endif
 ifeq ($(HOST_ARCH),arm64)
     # Building ARM
-    DOTNETRUNTIME := debian-arm64
+    DOTNETRUNTIME := linux-arm64
 endif
 ifeq ($(HOST_ARCH),aarch64)
     # Building ARM
-    DOTNETRUNTIME := debian-arm64
+    DOTNETRUNTIME := linux-arm64
 endif
 
 export DH_VERBOSE=1
-- 
cgit v1.2.3