Fix RPM installing on Ubuntu-22.04

Azure · Feb 27, 2024 · 6dfd9cd · 6dfd9cd
1 parent 89b5018
commit 6dfd9cd
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 1 deletion.
diff --git a/src/azbridge/azbridge.csproj b/src/azbridge/azbridge.csproj
@@ -108,6 +108,10 @@
 	<!-- Linux -->
 	<ItemGroup Condition="$(RuntimeIdentifier.StartsWith('linux'))">
 		<DebDependency Include="ca-certificates" Version="" />
+
+        <!-- Workaround for https://github.com/quamotion/dotnet-packaging/issues/222 (Support libssl3 for Ubuntu 22.04) -->
+        <DebDotNetDependencies Remove="libssl1.1 | libssl1.0.2 | libssl1.0.1 | libssl1.0.0 | libssl0.9.8"/>
+        <DebDotNetDependencies Include="libssl3 | libssl1.1 | libssl1.0.2 | libssl1.0.1 | libssl1.0.0 | libssl0.9.8"/>
 	</ItemGroup>
 
 	<!-- Linux Daemon install properties -->

diff --git a/test/nginx/Test.proj b/test/nginx/Test.proj
@@ -2,7 +2,7 @@
     <Import Project="Directory.Build.props" />
   <PropertyGroup>
     <OutputType>None</OutputType>
-    <UnixRuntimeIdentifiers>osx-x64;osx-arm64;debian.10-x64;ubuntu.18.04-x64;ubuntu.18.04-arm64;ubuntu.20.04-x64;ubuntu.20.04-arm64;opensuse.15.0-x64;fedora.34-x64;centos.9-x64</UnixRuntimeIdentifiers>
+    <UnixRuntimeIdentifiers>osx-x64;osx-arm64;debian.10-x64;ubuntu.18.04-x64;ubuntu.18.04-arm64;ubuntu.20.04-x64;ubuntu.20.04-arm64;ubuntu.22.04-x64;ubuntu.22.04-arm64;opensuse.15.0-x64;fedora.34-x64;centos.9-x64</UnixRuntimeIdentifiers>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/test/nginx/ubuntu.22.04-x64.client.dockerfile b/test/nginx/ubuntu.22.04-x64.client.dockerfile
@@ -0,0 +1,9 @@
+FROM ubuntu:22.04 AS build1
+RUN apt-get -qq update -y >/dev/null
+RUN apt-get -qq install -y wget >/dev/null
+
+FROM build1 AS build2
+ARG package_name
+COPY ./tmp/$package_name .
+RUN apt-get -qq install -y ./$package_name
+
diff --git a/test/nginx/ubuntu.22.04-x64.server.dockerfile b/test/nginx/ubuntu.22.04-x64.server.dockerfile
@@ -0,0 +1,9 @@
+FROM ubuntu:22.04 AS build1
+RUN apt-get -qq update -y
+RUN apt-get -qq install -y nginx >/dev/null
+COPY index.html /var/www/html
+
+FROM build1 AS build2
+ARG package_name
+COPY ./tmp/$package_name .
+RUN apt-get -qq install -y ./$package_name