From 320eda482a66d00a29b12f4bd6f3f35ff302b6c9 Mon Sep 17 00:00:00 2001 From: Luke Marsden Date: Thu, 1 Mar 2018 16:09:17 +0000 Subject: [PATCH] #306: try to make kernel modules get loaded from centos-style /lib/modules tarballs. --- cmd/dotmesh-server/Dockerfile | 2 ++ cmd/dotmesh-server/Dockerfile.multistage | 2 ++ 2 files changed, 4 insertions(+) diff --git a/cmd/dotmesh-server/Dockerfile b/cmd/dotmesh-server/Dockerfile index 98176ea28..3689af195 100644 --- a/cmd/dotmesh-server/Dockerfile +++ b/cmd/dotmesh-server/Dockerfile @@ -1,5 +1,7 @@ FROM ubuntu:artful ENV SECURITY_UPDATES 2018-01-19 RUN apt-get -y update && apt-get -y install zfsutils-linux iproute kmod curl +# Merge kernel module search paths from CentOS and Ubuntu :-O +RUN echo 'search updates extra ubuntu built-in weak-updates' > /etc/depmod.d/ubuntu.conf ADD require_zfs.sh /require_zfs.sh COPY ./target/* /usr/local/bin/ diff --git a/cmd/dotmesh-server/Dockerfile.multistage b/cmd/dotmesh-server/Dockerfile.multistage index 6a0f1d272..d88178f1a 100644 --- a/cmd/dotmesh-server/Dockerfile.multistage +++ b/cmd/dotmesh-server/Dockerfile.multistage @@ -27,5 +27,7 @@ RUN go build -ldflags "-X main.serverVersion=${VERSION}" -o /target/dotmesh-serv FROM ubuntu:artful ENV SECURITY_UPDATES 2018-01-19 RUN apt-get -y update && apt-get -y install zfsutils-linux iproute kmod curl +# Merge kernel module search paths from CentOS and Ubuntu :-O +RUN echo 'search updates extra ubuntu built-in weak-updates' > /etc/depmod.d/ubuntu.conf ADD require_zfs.sh /require_zfs.sh COPY --from=0 ./target/* /usr/local/bin/