From b2e6fd31cfd553e269e8c9f45e7d0aa6606f295a Mon Sep 17 00:00:00 2001 From: Austin Vazquez Date: Tue, 12 Aug 2025 16:35:31 -0500 Subject: [PATCH] Restore DOCKER_DRIVER environment variable for storage driver configuration. This change restores the environment variable configuration of daemon storage driver through the DOCKER_DRIVER environment variable. Signed-off-by: Austin Vazquez --- daemon/daemon.go | 4 ++-- integration/daemon/migration_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/daemon/daemon.go b/daemon/daemon.go index 0369222474..93b4a2b553 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -1098,7 +1098,7 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S // Unix platforms however run a single graphdriver for all containers, and it can // be set through an environment variable, a daemon start parameter, or chosen through // initialization of the layerstore through driver priority order for example. - driverName := os.Getenv("DOCKER_GRAPHDRIVER") + driverName := os.Getenv("DOCKER_DRIVER") if isWindows { if driverName == "" { driverName = cfgStore.GraphDriver @@ -1120,7 +1120,7 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S } } else if driverName != "" { - log.G(ctx).Infof("Setting the storage driver from the $DOCKER_GRAPHDRIVER environment variable (%s)", driverName) + log.G(ctx).Infof("Setting the storage driver from the $DOCKER_DRIVER environment variable (%s)", driverName) } else { driverName = cfgStore.GraphDriver } diff --git a/integration/daemon/migration_test.go b/integration/daemon/migration_test.go index b7850030b8..78f45de791 100644 --- a/integration/daemon/migration_test.go +++ b/integration/daemon/migration_test.go @@ -29,7 +29,7 @@ func testMigrateSnapshotter(t *testing.T, graphdriver, snapshotter string) { skip.If(t, runtime.GOOS != "linux") t.Setenv("DOCKER_MIGRATE_SNAPSHOTTER_THRESHOLD", "200M") - t.Setenv("DOCKER_GRAPHDRIVER", "") + t.Setenv("DOCKER_DRIVER", "") ctx := testutil.StartSpan(baseContext, t) @@ -93,7 +93,7 @@ func TestMigrateSaveLoad(t *testing.T) { skip.If(t, runtime.GOOS != "linux") t.Setenv("DOCKER_MIGRATE_SNAPSHOTTER_THRESHOLD", "200M") - t.Setenv("DOCKER_GRAPHDRIVER", "") + t.Setenv("DOCKER_DRIVER", "") var ( ctx = testutil.StartSpan(baseContext, t)