From 6d9faef6298721476b95db02a89e69f22ec69731 Mon Sep 17 00:00:00 2001 From: Rusty Lynch Date: Wed, 5 Jun 2019 13:25:56 -0700 Subject: [PATCH] Minimize memcached container using the os-core container. Convert memcached 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 --- memcached/Dockerfile | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/memcached/Dockerfile b/memcached/Dockerfile index 0c646ef..ac3dc56 100644 --- a/memcached/Dockerfile +++ b/memcached/Dockerfile @@ -1,11 +1,27 @@ -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=memcached --no-scripts \ + && rm -rf /install_root/var/lib/swupd/* + +FROM clearlinux/os-core:latest MAINTAINER qi.zheng@intel.com -ARG swupd_args - -RUN swupd update --no-boot-update $swupd_args -RUN swupd bundle-add memcached $swupd_args \ - && rm -rf /var/lib/swupd/* +COPY --from=builder /install_root / COPY docker-entrypoint.sh /usr/local/bin/ RUN chmod +x /usr/local/bin/docker-entrypoint.sh