From 89ca0ca927aa5dff7f30f3d941ab0a858de82b93 Mon Sep 17 00:00:00 2001 From: Aiden McClelland <3732071+dr-bonez@users.noreply.github.com> Date: Thu, 12 Jan 2023 09:56:54 -0700 Subject: [PATCH] fix docker storage driver (#2111) --- backend/src/init.rs | 2 +- build/lib/scripts/postinst | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/backend/src/init.rs b/backend/src/init.rs index c81594831..22cd214c8 100644 --- a/backend/src/init.rs +++ b/backend/src/init.rs @@ -207,7 +207,7 @@ pub async fn init(cfg: &RpcContextConfig) -> Result { let receipts = InitReceipts::new(&mut handle).await?; let should_rebuild = tokio::fs::metadata(SYSTEM_REBUILD_PATH).await.is_ok() - || &*receipts.server_version.get(&mut handle).await? < &emver::Version::new(0, 3, 2, 0); + || &*receipts.server_version.get(&mut handle).await? < &emver::Version::new(0, 3, 3, 1); let song = if should_rebuild { Some(NonDetachingJoinHandle::from(tokio::spawn(async { diff --git a/build/lib/scripts/postinst b/build/lib/scripts/postinst index b81e72a57..2bb3eb478 100755 --- a/build/lib/scripts/postinst +++ b/build/lib/scripts/postinst @@ -70,7 +70,12 @@ sed -i '/\(^\|#\)SystemMaxUse=/c\SystemMaxUse=1G' /etc/systemd/journald.conf sed -i '/\(^\|#\)ForwardToSyslog=/c\ForwardToSyslog=no' /etc/systemd/journald.conf mkdir -p /etc/docker ln -sf /usr/lib/embassy/docker-engine.slice /etc/systemd/system/docker-engine.slice -echo '{ "cgroup-parent": "docker-engine.slice" }' > /etc/docker/daemon.json +cat > /etc/docker/daemon.json << EOF +{ + "storage-driver": "overlay2", + "cgroup-parent": "docker-engine.slice" +} +EOF mkdir -p /etc/nginx/ssl # fix to suppress docker warning, fixed in 21.xx release of docker cli: https://github.com/docker/cli/pull/2934