Skip to content

Updating NuGet and Docker versions to latest #5405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 24, 2024
Merged

Updating NuGet and Docker versions to latest #5405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7a94de9
Updating NuGet and Docker versions to latest
joperezr Aug 23, 2024
ab64a11
Revert MongoDB update
eerhardt Aug 23, 2024
d52d38b
Extract phpmyadmin image and tag to follow the pattern used everywher…
eerhardt Aug 23, 2024
3f787f4
Merge pull request #1 from eerhardt/UpdateDependencies_FixPhpMyAdmin
joperezr Aug 23, 2024
bacb3ae
Fix two images that were not latest
joperezr Aug 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
</PropertyGroup>
<ItemGroup>
<!-- AWS SDK for .NET dependencies -->
<PackageVersion Include="AWSSDK.CloudFormation" Version="3.7.400.1" />
<PackageVersion Include="AWSSDK.SQS" Version="3.7.400.1" />
<PackageVersion Include="AWSSDK.SimpleNotificationService" Version="3.7.400.1" />
<PackageVersion Include="AWSSDK.Core" Version="3.7.400.1" />
<PackageVersion Include="AWSSDK.CloudFormation" Version="3.7.400.11" />
<PackageVersion Include="AWSSDK.SQS" Version="3.7.400.11" />
<PackageVersion Include="AWSSDK.SimpleNotificationService" Version="3.7.400.11" />
<PackageVersion Include="AWSSDK.Core" Version="3.7.400.11" />
<PackageVersion Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.301" />
<PackageVersion Include="AWS.Messaging" Version="0.9.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AWS" Version="1.1.0-beta.4" />
<PackageVersion Include="AWS.Messaging" Version="0.9.2" />
<PackageVersion Include="OpenTelemetry.Instrumentation.AWS" Version="1.1.0-beta.5" />
<PackageVersion Include="OpenTelemetry.Extensions.AWS" Version="1.3.0-beta.1" />
<!-- Azure SDK for .NET dependencies -->
<PackageVersion Include="Azure.AI.OpenAI" Version="2.0.0-beta.2" />
Expand All @@ -31,7 +31,7 @@
<PackageVersion Include="Azure.Storage.Queues" Version="12.19.1" />
<PackageVersion Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="7.3.0" />
<PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.42.0" />
<PackageVersion Include="Microsoft.Azure.SignalR" Version="1.26.0" />
<PackageVersion Include="Microsoft.Azure.SignalR" Version="1.26.1" />
<PackageVersion Include="Microsoft.Extensions.Azure" Version="1.7.5" />
<!-- Azure Management SDK for .NET dependencies -->
<PackageVersion Include="Azure.Provisioning" Version="0.3.0" />
Expand Down Expand Up @@ -93,16 +93,16 @@
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="$(MicrosoftExtensionsHttpResiliencePackageVersion)" />
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="$(MicrosoftExtensionsTimeProviderTestingVersion)" />
<!-- external dependencies -->
<PackageVersion Include="Confluent.Kafka" Version="2.5.0" />
<PackageVersion Include="Confluent.Kafka" Version="2.5.2" />
<PackageVersion Include="Dapper" Version="2.1.44" />
<PackageVersion Include="DnsClient" Version="1.8.0" />
<PackageVersion Include="Elastic.Clients.Elasticsearch" Version="8.14.7" />
<PackageVersion Include="Google.Protobuf" Version="3.27.2" />
<PackageVersion Include="Elastic.Clients.Elasticsearch" Version="8.15.2" />
<PackageVersion Include="Google.Protobuf" Version="3.27.3" />
<PackageVersion Include="Grpc.AspNetCore" Version="2.65.0" />
<PackageVersion Include="Grpc.Net.ClientFactory" Version="2.65.0" />
<PackageVersion Include="Grpc.Tools" Version="2.65.0" />
<PackageVersion Include="Humanizer.Core" Version="2.14.1" />
<PackageVersion Include="KubernetesClient" Version="14.0.2" />
<PackageVersion Include="KubernetesClient" Version="14.0.9" />
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.1" />
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.9.3" />
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.9.3" />
Expand All @@ -111,15 +111,15 @@
<PackageVersion Include="MongoDB.Driver.Core.Extensions.DiagnosticSources" Version="1.4.0" />
<PackageVersion Include="MySqlConnector.DependencyInjection" Version="2.3.6" />
<PackageVersion Include="MySqlConnector.Logging.Microsoft.Extensions.Logging" Version="2.1.0" />
<PackageVersion Include="NATS.Net" Version="2.3.2" />
<PackageVersion Include="NATS.Net" Version="2.3.3" />
<PackageVersion Include="Npgsql.DependencyInjection" Version="8.0.3" />
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
<PackageVersion Include="Oracle.EntityFrameworkCore" Version="8.23.50" />
<PackageVersion Include="Oracle.ManagedDataAccess.OpenTelemetry" Version="23.5.0" />
<PackageVersion Include="Polly.Core" Version="8.4.1" />
<PackageVersion Include="Polly.Extensions" Version="8.4.1" />
<PackageVersion Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
<PackageVersion Include="Qdrant.Client" Version="1.10.0" />
<PackageVersion Include="Qdrant.Client" Version="1.11.0" />
<PackageVersion Include="RabbitMQ.Client" Version="[6.8.1,7.0.0)" />
<PackageVersion Include="StackExchange.Redis" Version="2.8.0" />
<PackageVersion Include="System.IO.Hashing" Version="8.0.0" />
Expand All @@ -142,14 +142,14 @@
<PackageVersion Include="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.23564.4" />
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.24324.3" />
<!-- unit test dependencies -->
<PackageVersion Include="bUnit" Version="1.30.3" />
<PackageVersion Include="JsonSchema.Net" Version="7.1.2" />
<PackageVersion Include="bUnit" Version="1.31.3" />
<PackageVersion Include="JsonSchema.Net" Version="7.2.2" />
<PackageVersion Include="Microsoft.DotNet.RemoteExecutor" Version="$(MicrosoftDotNetRemoteExecutorPackageVersion)" />
<PackageVersion Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsPackageVersion)" />
<PackageVersion Include="Microsoft.Extensions.Diagnostics.Testing" Version="$(MicrosoftExtensionsDiagnosticsTestingPackageVersion)" />
<PackageVersion Include="Microsoft.NET.Runtime.WorkloadTesting.Internal" Version="$(MicrosoftNETRuntimeWorkloadTestingInternalVersion)" />
<PackageVersion Include="Microsoft.Playwright" Version="1.46.0" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.7.0" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.7.1" />
<PackageVersion Include="Testcontainers.MongoDb" Version="$(TestcontainersPackageVersion)" />
<PackageVersion Include="Testcontainers.MsSql" Version="$(TestcontainersPackageVersion)" />
<PackageVersion Include="Testcontainers.MySql" Version="$(TestcontainersPackageVersion)" />
Expand All @@ -161,7 +161,7 @@
<PackageVersion Include="Testcontainers.Oracle" Version="$(TestcontainersPackageVersion)" />
<PackageVersion Include="Testcontainers.Elasticsearch" Version="$(TestcontainersPackageVersion)" />
<!-- playground apps dependencies -->
<PackageVersion Include="Dapr.AspNetCore" Version="1.13.1" />
<PackageVersion Include="Dapr.AspNetCore" Version="1.14.0" />
<PackageVersion Include="Microsoft.Orleans.Clustering.AzureStorage" Version="8.2.0" />
<PackageVersion Include="Microsoft.Orleans.Persistence.AzureStorage" Version="8.2.0" />
<PackageVersion Include="Microsoft.Orleans.Client" Version="8.2.0" />
Expand Down
2 changes: 1 addition & 1 deletion src/Aspire.Hosting.Elasticsearch/ElasticsearchContainerImageTags.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ internal static class ElasticsearchContainerImageTags
{
public const string Registry = "docker.io";
public const string Image = "library/elasticsearch";
public const string Tag = "8.14.0";
public const string Tag = "8.15.0";
}

2 changes: 1 addition & 1 deletion src/Aspire.Hosting.Kafka/KafkaContainerImageTags.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ internal static class KafkaContainerImageTags
{
public const string Registry = "docker.io";
public const string Image = "confluentinc/confluent-local";
public const string Tag = "7.6.1";
public const string Tag = "7.7.0";
public const string KafkaUiImage = "provectuslabs/kafka-ui";
public const string KafkaUiTag = "v0.7.2";
}
2 changes: 1 addition & 1 deletion src/Aspire.Hosting.Keycloak/KeycloakContainerImageTags.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ internal static class KeycloakContainerImageTags
{
public const string Registry = "quay.io";
public const string Image = "keycloak/keycloak";
public const string Tag = "24.0";
public const string Tag = "25.0";
}
2 changes: 1 addition & 1 deletion src/Aspire.Hosting.Milvus/MilvusContainerImageTags.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ internal static class MilvusContainerImageTags
{
public const string Registry = "docker.io";
public const string Image = "milvusdb/milvus";
public const string Tag = "v2.4.7";
public const string Tag = "v2.4.9";

public const string AttuImage = "zilliz/attu";
public const string AttuTag = "v2.4";
Expand Down
2 changes: 1 addition & 1 deletion src/Aspire.Hosting.MySql/MySqlBuilderExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public static IResourceBuilder<T> WithPhpMyAdmin<T>(this IResourceBuilder<T> bui

var phpMyAdminContainer = new PhpMyAdminContainerResource(containerName);
var phpMyAdminContainerBuilder = builder.ApplicationBuilder.AddResource(phpMyAdminContainer)
.WithImage("library/phpmyadmin", "5.2")
.WithImage(MySqlContainerImageTags.PhpMyAdminImage, MySqlContainerImageTags.PhpMyAdminTag)
.WithImageRegistry(MySqlContainerImageTags.Registry)
.WithHttpEndpoint(targetPort: 80, name: "http")
.WithBindMount(configurationTempFileName, "/etc/phpmyadmin/config.user.inc.php")
Expand Down
5 changes: 4 additions & 1 deletion src/Aspire.Hosting.MySql/MySqlContainerImageTags.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,8 @@ internal static class MySqlContainerImageTags
{
public const string Registry = "docker.io";
public const string Image = "library/mysql";
public const string Tag = "8.3";
public const string Tag = "9.0";

public const string PhpMyAdminImage = "library/phpmyadmin";
public const string PhpMyAdminTag = "5.2";
}
2 changes: 1 addition & 1 deletion src/Aspire.Hosting.Oracle/OracleContainerImageTags.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ internal static class OracleContainerImageTags
{
public const string Registry = "container-registry.oracle.com";
public const string Image = "database/free";
public const string Tag = "23.3.0.0";
public const string Tag = "23.4.0.0";
}
4 changes: 2 additions & 2 deletions src/Aspire.Hosting.PostgreSQL/PostgresContainerImageTags.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ internal static class PostgresContainerImageTags
{
public const string Registry = "docker.io";
public const string Image = "library/postgres";
public const string Tag = "16.2";
public const string Tag = "16.4";
public const string PgAdminRegistry = "docker.io";
public const string PgAdminImage = "dpage/pgadmin4";
public const string PgAdminTag = "8.8";
public const string PgAdminTag = "8.11";
public const string PgWebRegistry = "docker.io";
public const string PgWebImage = "sosedoff/pgweb";
public const string PgWebTag = "0.15.0";
Expand Down
2 changes: 1 addition & 1 deletion src/Aspire.Hosting.Qdrant/QdrantContainerImageTags.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ internal static class QdrantContainerImageTags
{
public const string Registry = "docker.io";
public const string Image = "qdrant/qdrant";
public const string Tag = "v1.8.4";
public const string Tag = "v1.11.0";
}
2 changes: 1 addition & 1 deletion src/Aspire.Hosting.Redis/RedisContainerImageTags.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ internal static class RedisContainerImageTags
{
public const string Registry = "docker.io";
public const string Image = "library/redis";
public const string Tag = "7.2";
public const string Tag = "7.4";
public const string RedisCommanderRegistry = "docker.io";
public const string RedisCommanderImage = "rediscommander/redis-commander";
Copy link
Member

@DamianEdwards DamianEdwards Aug 24, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems there are more recent drops of the Redis Commander image at https://github.com/joeferner/redis-commander/pkgs/container/redis-commander which is from the actual author. Perhaps we should consider changing to that registry?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good to me, but I'd probably just separate that change so that it stays in main (9.0) only to get more bake time as this PR is going to get backported to 8.2.

public const string RedisCommanderTag = "latest";
Expand Down
2 changes: 1 addition & 1 deletion src/Aspire.Hosting.Seq/SeqContainerImageTags.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ internal static class SeqContainerImageTags
{
public const string Registry = "docker.io";
public const string Image = "datalust/seq";
public const string Tag = "2024.2";
public const string Tag = "2024.3";
}
2 changes: 1 addition & 1 deletion src/Aspire.Hosting.Valkey/ValkeyContainerImageTags.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ internal static class ValkeyContainerImageTags
{
public const string Registry = "docker.io";
public const string Image = "valkey/valkey";
public const string Tag = "7.2";
public const string Tag = "8.0";
}