From 3dc537dfca2a468b082e61e7aa81d53ba0af0bfd Mon Sep 17 00:00:00 2001 From: Rusty Lynch Date: Wed, 5 Jun 2019 12:51:20 -0700 Subject: [PATCH] Minimize the redis container using os-core base. Convert redis container to be based on the minimal os-core container, using a multistage build technique to add additional Clear Linux content. Signed-off-by: Rusty Lynch --- redis/Dockerfile | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/redis/Dockerfile b/redis/Dockerfile index 0353c13..4934c4a 100644 --- a/redis/Dockerfile +++ b/redis/Dockerfile @@ -1,12 +1,29 @@ -FROM clearlinux:latest +FROM clearlinux:latest AS builder + +# Move to latest Clear Linux release to ensure +# that the swupd command line arguments are +# correct +RUN swupd update --no-boot-update $swupd_args + +# Grab os-release info from the minimal base image so +# that the new content matches the exact OS version +COPY --from=clearlinux/os-core:latest /usr/lib/os-release / + +# Install additional content in a target directory +# using the os version from the minimal base +RUN source /os-release && \ + mkdir /install_root \ + && swupd os-install -V ${VERSION_ID} \ + --path /install_root --statedir /swupd-state \ + --bundles=redis-native,findutils --no-scripts \ + && rm -rf /install_root/var/lib/swupd/* + +FROM clearlinux/os-core:latest MAINTAINER qi.zheng@intel.com -ARG swupd_args +COPY --from=builder /install_root / -RUN swupd update --no-boot-update $swupd_args -RUN swupd bundle-add redis-native $swupd_args \ - && rm -rf /var/lib/swupd/* \ - && mkdir /data && chown redis:redis /data +RUN mkdir /data && chown redis:redis /data VOLUME /data WORKDIR /data