Skip to content

Commit

Permalink
Merge pull request #479 from flatcar/tormath1/device-mapper
Browse files Browse the repository at this point in the history
docker: fix some issues with LTS 2022
  • Loading branch information
tormath1 authored Nov 7, 2023
2 parents 54f2aef + 35e0b7c commit 9e475a7
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions kola/tests/docker/docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,11 @@ passwd:
Platforms: []string{"qemu", "qemu-unpriv"},
// Note: copied verbatim from https://github.com/coreos/docs/blob/master/os/mounting-storage.md#creating-and-mounting-a-btrfs-volume-file
// Added explicit btrfs driver selection because overlay2 is the default for btrfs FS in docker 23 and above
UserData: conf.Butane(`
variant: flatcar
version: 1.0.0
UserData: conf.ContainerLinuxConfig(`
storage:
files:
- path: /etc/docker/daemon.json
filesystem: root
contents:
inline: |
{
Expand All @@ -159,7 +157,7 @@ storage:
systemd:
units:
- name: format-var-lib-docker.service
enabled: true
enable: true
contents: |
[Unit]
Before=docker.service var-lib-docker.mount
Expand All @@ -171,7 +169,7 @@ systemd:
[Install]
WantedBy=multi-user.target
- name: var-lib-docker.mount
enabled: true
enable: true
contents: |
[Unit]
Before=docker.service
Expand All @@ -188,6 +186,7 @@ systemd:
})

register.Register(&register.Test{
MinVersion: semver.Version{Major: 3034},
Run: func(c cluster.TestCluster) { testDockerInfo("devicemapper", c) },
ClusterSize: 1,
Name: "docker.devicemapper-storage",
Expand Down

0 comments on commit 9e475a7

Please sign in to comment.