From 7a94de9d098cdbf1a428b2ab1ebd70577b3797ca Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Fri, 23 Aug 2024 12:01:21 -0700 Subject: [PATCH 1/4] Updating NuGet and Docker versions to latest --- Directory.Packages.props | 38 +++++++++---------- .../ElasticsearchContainerImageTags.cs | 2 +- .../KafkaContainerImageTags.cs | 2 +- .../KeycloakContainerImageTags.cs | 2 +- .../MilvusContainerImageTags.cs | 2 +- .../MySqlContainerImageTags.cs | 2 +- .../OracleContainerImageTags.cs | 2 +- .../PostgresContainerImageTags.cs | 4 +- .../QdrantContainerImageTags.cs | 2 +- .../RedisContainerImageTags.cs | 2 +- .../SeqContainerImageTags.cs | 2 +- .../ValkeyContainerImageTags.cs | 2 +- 12 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index c10375d5ff0..14d99f948f6 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -10,13 +10,13 @@ - - - - + + + + - - + + @@ -31,7 +31,7 @@ - + @@ -93,25 +93,25 @@ - + - - + + - + - - + + - + @@ -119,7 +119,7 @@ - + @@ -142,14 +142,14 @@ - - + + - + @@ -161,7 +161,7 @@ - + diff --git a/src/Aspire.Hosting.Elasticsearch/ElasticsearchContainerImageTags.cs b/src/Aspire.Hosting.Elasticsearch/ElasticsearchContainerImageTags.cs index 4a43f9c7a3f..ccc3d2c4f37 100644 --- a/src/Aspire.Hosting.Elasticsearch/ElasticsearchContainerImageTags.cs +++ b/src/Aspire.Hosting.Elasticsearch/ElasticsearchContainerImageTags.cs @@ -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"; } diff --git a/src/Aspire.Hosting.Kafka/KafkaContainerImageTags.cs b/src/Aspire.Hosting.Kafka/KafkaContainerImageTags.cs index 1decf74b1e6..5883e703414 100644 --- a/src/Aspire.Hosting.Kafka/KafkaContainerImageTags.cs +++ b/src/Aspire.Hosting.Kafka/KafkaContainerImageTags.cs @@ -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"; } diff --git a/src/Aspire.Hosting.Keycloak/KeycloakContainerImageTags.cs b/src/Aspire.Hosting.Keycloak/KeycloakContainerImageTags.cs index 470c8a89cef..060abb8397c 100644 --- a/src/Aspire.Hosting.Keycloak/KeycloakContainerImageTags.cs +++ b/src/Aspire.Hosting.Keycloak/KeycloakContainerImageTags.cs @@ -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"; } diff --git a/src/Aspire.Hosting.Milvus/MilvusContainerImageTags.cs b/src/Aspire.Hosting.Milvus/MilvusContainerImageTags.cs index 51a60e09f4a..bc47a438b5f 100644 --- a/src/Aspire.Hosting.Milvus/MilvusContainerImageTags.cs +++ b/src/Aspire.Hosting.Milvus/MilvusContainerImageTags.cs @@ -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"; diff --git a/src/Aspire.Hosting.MySql/MySqlContainerImageTags.cs b/src/Aspire.Hosting.MySql/MySqlContainerImageTags.cs index 37639f3df48..1edf50197fe 100644 --- a/src/Aspire.Hosting.MySql/MySqlContainerImageTags.cs +++ b/src/Aspire.Hosting.MySql/MySqlContainerImageTags.cs @@ -7,5 +7,5 @@ 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"; } diff --git a/src/Aspire.Hosting.Oracle/OracleContainerImageTags.cs b/src/Aspire.Hosting.Oracle/OracleContainerImageTags.cs index a13af86a1df..839e06e05c9 100644 --- a/src/Aspire.Hosting.Oracle/OracleContainerImageTags.cs +++ b/src/Aspire.Hosting.Oracle/OracleContainerImageTags.cs @@ -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"; } diff --git a/src/Aspire.Hosting.PostgreSQL/PostgresContainerImageTags.cs b/src/Aspire.Hosting.PostgreSQL/PostgresContainerImageTags.cs index 796aa53a8fa..d0160db2fb3 100644 --- a/src/Aspire.Hosting.PostgreSQL/PostgresContainerImageTags.cs +++ b/src/Aspire.Hosting.PostgreSQL/PostgresContainerImageTags.cs @@ -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.9"; public const string PgWebRegistry = "docker.io"; public const string PgWebImage = "sosedoff/pgweb"; public const string PgWebTag = "0.15.0"; diff --git a/src/Aspire.Hosting.Qdrant/QdrantContainerImageTags.cs b/src/Aspire.Hosting.Qdrant/QdrantContainerImageTags.cs index d6d2100a2cb..74d88d6f1d8 100644 --- a/src/Aspire.Hosting.Qdrant/QdrantContainerImageTags.cs +++ b/src/Aspire.Hosting.Qdrant/QdrantContainerImageTags.cs @@ -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.9.7"; } diff --git a/src/Aspire.Hosting.Redis/RedisContainerImageTags.cs b/src/Aspire.Hosting.Redis/RedisContainerImageTags.cs index e05d46fef0c..6ef38706cea 100644 --- a/src/Aspire.Hosting.Redis/RedisContainerImageTags.cs +++ b/src/Aspire.Hosting.Redis/RedisContainerImageTags.cs @@ -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"; public const string RedisCommanderTag = "latest"; diff --git a/src/Aspire.Hosting.Seq/SeqContainerImageTags.cs b/src/Aspire.Hosting.Seq/SeqContainerImageTags.cs index 2b3305d1056..9caff923b6c 100644 --- a/src/Aspire.Hosting.Seq/SeqContainerImageTags.cs +++ b/src/Aspire.Hosting.Seq/SeqContainerImageTags.cs @@ -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"; } diff --git a/src/Aspire.Hosting.Valkey/ValkeyContainerImageTags.cs b/src/Aspire.Hosting.Valkey/ValkeyContainerImageTags.cs index e5422978b45..53286fc3cea 100644 --- a/src/Aspire.Hosting.Valkey/ValkeyContainerImageTags.cs +++ b/src/Aspire.Hosting.Valkey/ValkeyContainerImageTags.cs @@ -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"; } From ab64a11c085d4c0f4d987f62a40d3a19235f0cc0 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 23 Aug 2024 14:44:39 -0500 Subject: [PATCH 2/4] Revert MongoDB update --- Directory.Packages.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 14d99f948f6..abccfeb1a6e 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -107,8 +107,8 @@ - - + + From d52d38bc5e7b1a25790292d7d4240a97d5395884 Mon Sep 17 00:00:00 2001 From: Eric Erhardt Date: Fri, 23 Aug 2024 16:22:36 -0500 Subject: [PATCH 3/4] Extract phpmyadmin image and tag to follow the pattern used everywhere else. --- src/Aspire.Hosting.MySql/MySqlBuilderExtensions.cs | 2 +- src/Aspire.Hosting.MySql/MySqlContainerImageTags.cs | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Aspire.Hosting.MySql/MySqlBuilderExtensions.cs b/src/Aspire.Hosting.MySql/MySqlBuilderExtensions.cs index 72e1c12b379..e2bee2376a3 100644 --- a/src/Aspire.Hosting.MySql/MySqlBuilderExtensions.cs +++ b/src/Aspire.Hosting.MySql/MySqlBuilderExtensions.cs @@ -82,7 +82,7 @@ public static IResourceBuilder WithPhpMyAdmin(this IResourceBuilder 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") diff --git a/src/Aspire.Hosting.MySql/MySqlContainerImageTags.cs b/src/Aspire.Hosting.MySql/MySqlContainerImageTags.cs index 1edf50197fe..fa86dc6ae1f 100644 --- a/src/Aspire.Hosting.MySql/MySqlContainerImageTags.cs +++ b/src/Aspire.Hosting.MySql/MySqlContainerImageTags.cs @@ -8,4 +8,7 @@ internal static class MySqlContainerImageTags public const string Registry = "docker.io"; public const string Image = "library/mysql"; public const string Tag = "9.0"; + + public const string PhpMyAdminImage = "library/phpmyadmin"; + public const string PhpMyAdminTag = "5.2"; } From bacb3aec54413cabbc0da58bdc99ba4bc7e0795e Mon Sep 17 00:00:00 2001 From: Jose Perez Rodriguez Date: Fri, 23 Aug 2024 18:23:58 -0700 Subject: [PATCH 4/4] Fix two images that were not latest --- src/Aspire.Hosting.PostgreSQL/PostgresContainerImageTags.cs | 2 +- src/Aspire.Hosting.Qdrant/QdrantContainerImageTags.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Aspire.Hosting.PostgreSQL/PostgresContainerImageTags.cs b/src/Aspire.Hosting.PostgreSQL/PostgresContainerImageTags.cs index d0160db2fb3..35b74e85622 100644 --- a/src/Aspire.Hosting.PostgreSQL/PostgresContainerImageTags.cs +++ b/src/Aspire.Hosting.PostgreSQL/PostgresContainerImageTags.cs @@ -10,7 +10,7 @@ internal static class PostgresContainerImageTags public const string Tag = "16.4"; public const string PgAdminRegistry = "docker.io"; public const string PgAdminImage = "dpage/pgadmin4"; - public const string PgAdminTag = "8.9"; + 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"; diff --git a/src/Aspire.Hosting.Qdrant/QdrantContainerImageTags.cs b/src/Aspire.Hosting.Qdrant/QdrantContainerImageTags.cs index 74d88d6f1d8..fcd184b084d 100644 --- a/src/Aspire.Hosting.Qdrant/QdrantContainerImageTags.cs +++ b/src/Aspire.Hosting.Qdrant/QdrantContainerImageTags.cs @@ -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.9.7"; + public const string Tag = "v1.11.0"; }