diff --git a/Dockerfile b/Dockerfile index 7100e2b..c31ef7d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ RUN (echo "deb-src http://archive.debian.org/debian etch main" >> /etc/apt/sourc linux-source-2.6.24 && \ apt-get build-dep -y linux-image-2.6.24-etchnhalf.1-686 && \ apt-get clean - # rm -rf /var/lib/apt/lists/* + rm -rf /var/lib/apt/lists/* WORKDIR /usr/src COPY unionfs-2.2.3_for_2.6.24.diff.gz ./ @@ -33,6 +33,7 @@ FROM lpenz/debian-lenny-i386-minbase WORKDIR /root COPY --from=kernel-builder /usr/src/*.deb . COPY update-initramfs.sh . +COPY desktop.list . RUN apt-get update && \ apt-get -y --force-yes install live-helper genisoimage syslinux squashfs-tools aptitude && \ apt-get clean diff --git a/Jenkinsfile b/Jenkinsfile index 9cbcbe6..e42c713 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -46,39 +46,8 @@ pipeline { cp /root/update-initramfs.sh config/chroot_local-hooks cp /root/linux-image-*.deb config/chroot_local-packages/ cp /root/squashfs-modules-*.deb config/chroot_local-packages/ + cp /root/desktop.list config/chroot_local-packageslists/ ''' - sh ''' - |cat > config/chroot_local-packageslists/desktop.list <<'EOF' - |xserver-xorg - |xinit - |xterm - |xfonts-base - |xfonts-100dpi - |xfonts-75dpi - |xfonts-scalable - |fluxbox - |menu - |pcmanfm - |lxpanel - |leafpad - |roxterm - |dbus - |hal - |pmount - |sudo - |alsa-base - |alsa-utils - |pciutils - |usbutils - |psmisc - |wget - |curl - |less - |unzip - |zip - |EOF - '''.stripMargin() - sh 'lh_build' } } diff --git a/desktop.list b/desktop.list new file mode 100644 index 0000000..6bd7d21 --- /dev/null +++ b/desktop.list @@ -0,0 +1,27 @@ +xserver-xorg +xinit +xterm +xfonts-base +xfonts-100dpi +xfonts-75dpi +xfonts-scalable +fluxbox +menu +pcmanfm +lxpanel +leafpad +roxterm +dbus +hal +pmount +sudo +alsa-base +alsa-utils +pciutils +usbutils +psmisc +wget +curl +less +unzip +zip \ No newline at end of file