mirror of
https://github.com/clearlinux/dockerfiles.git
synced 2026-05-13 18:33:34 +00:00
07d1c7c968
When removing the duplicated file and directory via rm -d, if it's a non-empty directory, it will prompt the warning message that the directory could not be removed becuase it is not empty. This is as expectation, as there are other files under the same diretory and we need to keep them. Hide these warning message to avoid confusion. Signed-off-by: Liu, Jianjun <jianjun.liu@intel.com>
35 lines
1.2 KiB
Docker
35 lines
1.2 KiB
Docker
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=sudo,curl,scm-server --no-scripts \
|
|
&& rm -rf /install_root/var/lib/swupd/*
|
|
|
|
# For some Host OS configuration with redirect_dir on,
|
|
# extra data are saved on the upper layer when the same
|
|
# file exists on different layers. To minimize docker
|
|
# image size, remove the overlapped files before copy.
|
|
RUN mkdir /os_core_install
|
|
COPY --from=clearlinux/os-core:latest / /os_core_install/
|
|
RUN cd / && \
|
|
find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true
|
|
|
|
FROM clearlinux/httpd:latest
|
|
|
|
COPY --from=builder /install_root /
|
|
COPY cgitrc /etc/cgitrc
|
|
COPY httpd-cgit.conf /etc/httpd/conf.d/httpd-cgit.conf
|