clearlinux/dockerfiles
2
0
Fork 0
mirror of https://github.com/clearlinux/dockerfiles.git synced 2026-08-19 04:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minimize the httpd and cgit containers using os-core base.

Browse Source 
Convert httpd and cgit containers to utilize the minimal os-core
container, using a multistage build technique to add additional
Clear Linux content.

Signed-off-by: Rusty Lynch <rusty.lynch@intel.com>
This commit is contained in:
Rusty Lynch
2019-06-05 13:04:03 -07:00
committed by William Douglas
parent 3dc537dfca
commit 6502140eee
2 changed files with 42 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cgit/Dockerfile
+20 -4
View File
@@ -1,9 +1,25 @@
FROM clearlinux/httpd
FROM clearlinux:latest AS builder
ARG swupd_args
# Move to latest Clear Linux release to ensure
# that the swupd command line arguments are
# correct
RUN swupd update --no-boot-update $swupd_args
RUN swupd bundle-add sudo curl scm-server $swupd_args \
&& rm -rf /var/lib/swupd/*
# 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/*
FROM clearlinux/httpd:latest
COPY --from=builder /install_root /
COPY cgitrc /etc/cgitrc
COPY httpd-cgit.conf /etc/httpd/conf.d/httpd-cgit.conf
httpd/Dockerfile
+22 -6
View File
@@ -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=httpd --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 httpd $swupd_args \
&& rm -rf /var/lib/swupd/*
COPY --from=builder /install_root /
#default configuration on /usr/share/defaults/httpd/httpd.conf
#create folder for default DocumentRoot and LOG/PidFile path