Skip to content

Commit

Permalink
AVRO-4079: Remove not needed libssl trickery, what was required by C#…
Browse files Browse the repository at this point in the history
… NET 3.1 and 5.0 (#3215)

* Remove netcoreapp3.1 and 5.0 support

* Revert to ubuntu-latest

* Remove libssl trickery

---------

Co-authored-by: Zoltan Csizmadia <Zoltan.Csizmadia@vericast.com>
  • Loading branch information
zcsizmadia and Zoltan Csizmadia authored Oct 16, 2024
1 parent 1fa1066 commit cc563e0
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 11 deletions.
7 changes: 5 additions & 2 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
"name": "Avro Development",
"build": {
"dockerfile": "../share/docker/Dockerfile",
"context": ".."
"context": "..",
"options": [
"--build-arg=BUILDPLATFORM=linux/amd64" // Dockerfile needs a build platfrom argument
]
},
"customizations": {
"vscode": {
Expand All @@ -27,4 +30,4 @@
]
}
}
}
}
2 changes: 1 addition & 1 deletion lang/csharp/common.props
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)\LICENSE" Pack="true" Visible="false" PackagePath=""/>
<None Include="$(MSBuildThisFileDirectory)\README.md" Pack="true" Visible="false" PackagePath=""/>
<None Include="$(MSBuildThisFileDirectory)\..\..\doc\assets\icons\logo.png" Pack="true" Visible="false" PackagePath=""/>
<None Include="$(MSBuildThisFileDirectory)\..\..\doc\assets\images\logo.png" Pack="true" Visible="false" PackagePath=""/>
</ItemGroup>

<PropertyGroup>
Expand Down
8 changes: 0 additions & 8 deletions share/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -94,14 +94,6 @@ RUN apt-get -qqy install --no-install-recommends libzstd-dev \
php-mbstring \
php-dev

# Required for Dotnet
RUN export ARCH="$(dpkg --print-architecture)"; \
export LIBSSL_DEB="libssl1.1_1.1.1f-1ubuntu2.23_$ARCH.deb"; \
wget -q "http://security.ubuntu.com/ubuntu/pool/main/o/openssl/$LIBSSL_DEB" || \
wget -q "http://ports.ubuntu.com/ubuntu-ports/pool/main/o/openssl/$LIBSSL_DEB"; \
dpkg -i "$LIBSSL_DEB"; \
rm "$LIBSSL_DEB"

# Install a maven release -------------------------------------------
# Inspired from https://github.com/apache/accumulo-docker/blob/bbb9892e165d40fb35fa19f38929effc5d0c709b/Dockerfile#L30
ENV MAVEN_VERSION 3.9.6
Expand Down

0 comments on commit cc563e0

Please sign in to comment.