Skip to content

Commit 8a4db17

Browse files
joperezrjoperezr
authored
[release/13.1] Undo the changes to bump PostgreSql to 18 until we validate No Data Checksums (#13575)
* Undo the changes to bump PostgreSql to 18 until we validate No Data Checksums * Update src/Aspire.Hosting.PostgreSQL/PostgresContainerImageTags.cs
1 parent e0feeec commit 8a4db17

File tree

4 files changed

+13
-24
lines changed

4 files changed

+13
-24
lines changed

‎src/Aspire.Hosting.PostgreSQL/PostgresBuilderExtensions.cs‎

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,7 @@ public static IResourceBuilder<PostgresServerResource> AddPostgres(this IDistrib
107107
.WithImageRegistry(PostgresContainerImageTags.Registry)
108108
.WithIconName("DatabaseMultiple")
109109
.WithEnvironment("POSTGRES_HOST_AUTH_METHOD", "scram-sha-256")
110-
// PostgreSQL 18+ enables data checksums by default. We disable them to maintain backward compatibility
111-
// with existing volumes that don't have checksums enabled, preventing initialization failures when
112-
// reusing data directories from earlier versions.
113-
.WithEnvironment("POSTGRES_INITDB_ARGS", "--auth-host=scram-sha-256 --auth-local=scram-sha-256 --no-data-checksums")
110+
.WithEnvironment("POSTGRES_INITDB_ARGS", "--auth-host=scram-sha-256 --auth-local=scram-sha-256")
114111
.WithEnvironment(context =>
115112
{
116113
context.EnvironmentVariables[UserEnvVarName] = postgresServer.UserNameReference;
@@ -373,12 +370,8 @@ public static IResourceBuilder<PostgresServerResource> WithDataVolume(this IReso
373370
{
374371
ArgumentNullException.ThrowIfNull(builder);
375372

376-
// PostgreSQL 18+ Docker images changed the data directory structure to use major-version-specific
377-
// subdirectories (e.g., /var/lib/postgresql/data/18). The mount point must be /var/lib/postgresql
378-
// instead of /var/lib/postgresql/data to accommodate this change. Prior to PostgreSQL 18, the
379-
// mount point was /var/lib/postgresql/data.
380373
return builder.WithVolume(name ?? VolumeNameGenerator.Generate(builder, "data"),
381-
"/var/lib/postgresql", isReadOnly);
374+
"/var/lib/postgresql/data", isReadOnly);
382375
}
383376

384377
/// <summary>
@@ -393,11 +386,7 @@ public static IResourceBuilder<PostgresServerResource> WithDataBindMount(this IR
393386
ArgumentNullException.ThrowIfNull(builder);
394387
ArgumentException.ThrowIfNullOrEmpty(source);
395388

396-
// PostgreSQL 18+ Docker images changed the data directory structure to use major-version-specific
397-
// subdirectories (e.g., /var/lib/postgresql/data/18). The mount point must be /var/lib/postgresql
398-
// instead of /var/lib/postgresql/data to accommodate this change. Prior to PostgreSQL 18, the
399-
// mount point was /var/lib/postgresql/data.
400-
return builder.WithBindMount(source, "/var/lib/postgresql", isReadOnly);
389+
return builder.WithBindMount(source, "/var/lib/postgresql/data", isReadOnly);
401390
}
402391

403392
/// <summary>

‎src/Aspire.Hosting.PostgreSQL/PostgresContainerImageTags.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ internal static class PostgresContainerImageTags
1111
/// <remarks>library/postgres</remarks>
1212
public const string Image = "library/postgres";
1313

14-
/// <remarks>18.0</remarks>
15-
public const string Tag = "18.0";
14+
/// <remarks>17.6</remarks>
15+
public const string Tag = "17.6";
1616

1717
/// <remarks>docker.io</remarks>
1818
public const string PgAdminRegistry = "docker.io";

‎tests/Aspire.Hosting.PostgreSQL.Tests/AddPostgresTests.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public async Task AddPostgresWithDefaultsAddsAnnotationMetadata()
7979
env =>
8080
{
8181
Assert.Equal("POSTGRES_INITDB_ARGS", env.Key);
82-
Assert.Equal("--auth-host=scram-sha-256 --auth-local=scram-sha-256 --no-data-checksums", env.Value);
82+
Assert.Equal("--auth-host=scram-sha-256 --auth-local=scram-sha-256", env.Value);
8383
},
8484
env =>
8585
{
@@ -133,7 +133,7 @@ public async Task AddPostgresAddsAnnotationMetadata()
133133
env =>
134134
{
135135
Assert.Equal("POSTGRES_INITDB_ARGS", env.Key);
136-
Assert.Equal("--auth-host=scram-sha-256 --auth-local=scram-sha-256 --no-data-checksums", env.Value);
136+
Assert.Equal("--auth-host=scram-sha-256 --auth-local=scram-sha-256", env.Value);
137137
},
138138
env =>
139139
{
@@ -226,7 +226,7 @@ public async Task AddDatabaseToPostgresAddsAnnotationMetadata()
226226
env =>
227227
{
228228
Assert.Equal("POSTGRES_INITDB_ARGS", env.Key);
229-
Assert.Equal("--auth-host=scram-sha-256 --auth-local=scram-sha-256 --no-data-checksums", env.Value);
229+
Assert.Equal("--auth-host=scram-sha-256 --auth-local=scram-sha-256", env.Value);
230230
},
231231
env =>
232232
{
@@ -257,7 +257,7 @@ public async Task VerifyManifest()
257257
"image": "{{PostgresContainerImageTags.Registry}}/{{PostgresContainerImageTags.Image}}:{{PostgresContainerImageTags.Tag}}",
258258
"env": {
259259
"POSTGRES_HOST_AUTH_METHOD": "scram-sha-256",
260-
"POSTGRES_INITDB_ARGS": "--auth-host=scram-sha-256 --auth-local=scram-sha-256 --no-data-checksums",
260+
"POSTGRES_INITDB_ARGS": "--auth-host=scram-sha-256 --auth-local=scram-sha-256",
261261
"POSTGRES_USER": "postgres",
262262
"POSTGRES_PASSWORD": "{pg-password.value}"
263263
},
@@ -300,7 +300,7 @@ public async Task VerifyManifestWithParameters()
300300
"image": "{{PostgresContainerImageTags.Registry}}/{{PostgresContainerImageTags.Image}}:{{PostgresContainerImageTags.Tag}}",
301301
"env": {
302302
"POSTGRES_HOST_AUTH_METHOD": "scram-sha-256",
303-
"POSTGRES_INITDB_ARGS": "--auth-host=scram-sha-256 --auth-local=scram-sha-256 --no-data-checksums",
303+
"POSTGRES_INITDB_ARGS": "--auth-host=scram-sha-256 --auth-local=scram-sha-256",
304304
"POSTGRES_USER": "{user.value}",
305305
"POSTGRES_PASSWORD": "{pass.value}"
306306
},
@@ -326,7 +326,7 @@ public async Task VerifyManifestWithParameters()
326326
"image": "{{PostgresContainerImageTags.Registry}}/{{PostgresContainerImageTags.Image}}:{{PostgresContainerImageTags.Tag}}",
327327
"env": {
328328
"POSTGRES_HOST_AUTH_METHOD": "scram-sha-256",
329-
"POSTGRES_INITDB_ARGS": "--auth-host=scram-sha-256 --auth-local=scram-sha-256 --no-data-checksums",
329+
"POSTGRES_INITDB_ARGS": "--auth-host=scram-sha-256 --auth-local=scram-sha-256",
330330
"POSTGRES_USER": "{user.value}",
331331
"POSTGRES_PASSWORD": "{pg2-password.value}"
332332
},
@@ -352,7 +352,7 @@ public async Task VerifyManifestWithParameters()
352352
"image": "{{PostgresContainerImageTags.Registry}}/{{PostgresContainerImageTags.Image}}:{{PostgresContainerImageTags.Tag}}",
353353
"env": {
354354
"POSTGRES_HOST_AUTH_METHOD": "scram-sha-256",
355-
"POSTGRES_INITDB_ARGS": "--auth-host=scram-sha-256 --auth-local=scram-sha-256 --no-data-checksums",
355+
"POSTGRES_INITDB_ARGS": "--auth-host=scram-sha-256 --auth-local=scram-sha-256",
356356
"POSTGRES_USER": "postgres",
357357
"POSTGRES_PASSWORD": "{pass.value}"
358358
},

‎tests/Aspire.Hosting.Tests/ManifestGenerationTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ public void VerifyTestProgramFullManifest()
441441
"image": "{{ComponentTestConstants.AspireTestContainerRegistry}}/{{PostgresContainerImageTags.Image}}:{{PostgresContainerImageTags.Tag}}",
442442
"env": {
443443
"POSTGRES_HOST_AUTH_METHOD": "scram-sha-256",
444-
"POSTGRES_INITDB_ARGS": "--auth-host=scram-sha-256 --auth-local=scram-sha-256 --no-data-checksums",
444+
"POSTGRES_INITDB_ARGS": "--auth-host=scram-sha-256 --auth-local=scram-sha-256",
445445
"POSTGRES_USER": "postgres",
446446
"POSTGRES_PASSWORD": "{postgres-password.value}",
447447
"POSTGRES_DB": "postgresdb"

0 commit comments

Comments
 (0)