Skip to content

Commit

Permalink
Update to docker script
Browse files Browse the repository at this point in the history
Signed-off-by: Bala Raman <[email protected]>
  • Loading branch information
srbala committed Nov 18, 2021
1 parent 70ed294 commit 0afb31f
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 12 deletions.
9 changes: 4 additions & 5 deletions almalinux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ RUN mkdir -p /mnt/sys-root; \
less \
libibverbs \
libmetalink \
libmetalink \
libnl3 \
libpcap \
libuser \
Expand All @@ -34,7 +33,6 @@ RUN mkdir -p /mnt/sys-root; \
openssl-pkcs11 \
passwd \
pciutils \
pciutils \
pciutils-libs \
platform-python-pip \
procps-ng \
Expand All @@ -57,8 +55,7 @@ RUN mkdir -p /mnt/sys-root; \
which \
xz \
yum \
yum-utils \
; \
yum-utils;\
dnf --installroot /mnt/sys-root clean all; \
rm -rf /mnt/sys-root/var/cache/* /mnt/sys-root/var/log/dnf* /mnt/sys-root/var/log/yum.*; \
# cp /etc/yum.repos.d/*.repo /mnt/sys-root/etc/yum.repos.d/; \
Expand All @@ -75,7 +72,9 @@ FROM scratch

COPY --from=system-build /mnt/sys-root/ /

ENV LANG=C.utf8
ENV LANG=C.utf8

LABEL MAINTAINER="Bala Raman<[email protected]>"

RUN systemctl set-default multi-user.target; \
systemctl mask systemd-remount-fs.service \
Expand Down
18 changes: 11 additions & 7 deletions clearlinux/Dockerfile.cl-wsl
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,22 @@ FROM clearlinux:latest AS builder
ARG swupd_args

# Move to latest Clear Linux release
RUN swupd update --no-boot-update $swupd_args

RUN swupd update --no-boot-update $swupd_args
# Install clean os-core bundle in target directory
# using the new os version
RUN source /usr/lib/os-release \
&& mkdir /install_root \
&& swupd os-install \
--bundles=containers-basic,binutils,which,cryptography,curl,make,jq,make,iproute2 \
RUN source /usr/lib/os-release; \
kdir /install_root; \
swupd os-install \
# --bundles=os-core
--bundles=os-core,binutils,which,cryptography,curl,make,jq,make,iproute2,less \
-V ${VERSION_ID} \
--path /install_root --statedir /swupd-state \
--bundles=os-core --no-boot-update
--no-boot-update

FROM scratch
#
COPY --from=builder /install_root /
#
LABEL MAINTAINER="Bala Raman<[email protected]>"
#
CMD ["/bin/bash"]

0 comments on commit 0afb31f

Please sign in to comment.