diff --git a/Dockerfile b/Dockerfile index f0903d1..021ea4b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -168,6 +168,7 @@ FROM lpenz/debian-lenny-i386-minbase WORKDIR /root COPY --from=kernel-builder /usr/src/*.deb . COPY --from=ut99-builder /root/ut-game ./ut-game +COPY /deps ./deps COPY update-initramfs.sh . COPY zzz-config-live.sh . COPY desktop . @@ -178,4 +179,6 @@ RUN apt-get update && \ apt-get -y --force-yes install live-helper genisoimage syslinux squashfs-tools aptitude && \ apt-get clean # rm -rf /var/lib/apt/lists/* -WORKDIR /root/live \ No newline at end of file +WORKDIR /root/live + +FROM kernel-builder \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index c472c37..d16397d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -123,7 +123,6 @@ pipeline { -k retrodebian1 cp -R /usr/share/live-helper/templates/* config/templates/ - sed -i \ -e 's|^menu vshift.*|menu vshift 0|' \ -e 's|^menu hshift.*|menu hshift 0|' \ @@ -135,6 +134,8 @@ pipeline { -e 's|^menu color timeout_msg.*|menu color timeout_msg * #ffB0B0B0 #00000000 none|' \ -e 's|^menu color timeout.*|menu color timeout * #ffff0000 #00000000 none|' \ config/templates/syslinux/menu/header.cfg + + tar -xf /root/deps/theme-AdwaitaDark.tar -C /usr/share/themes/ chmod +x /root/update-initramfs.sh chmod +x /root/zzz-config-live.sh diff --git a/deps/theme-AdwaitaDark.tar b/deps/theme-AdwaitaDark.tar new file mode 100644 index 0000000..5b71bb7 Binary files /dev/null and b/deps/theme-AdwaitaDark.tar differ diff --git a/desktop b/desktop index f4cb8cb..712e8c3 100644 --- a/desktop +++ b/desktop @@ -43,6 +43,5 @@ libopenal0a usplash debian-edu-artwork-usplash libxft2 -gtk2-engines-mist -gtk2-engines-industrial -gtk2-engines-clearlooks \ No newline at end of file +gtk2-engines-clearlooks +gtk-theme-switch \ No newline at end of file diff --git a/zzz-config-live.sh b/zzz-config-live.sh index 432dab6..61faecc 100644 --- a/zzz-config-live.sh +++ b/zzz-config-live.sh @@ -24,7 +24,8 @@ fi EOF cat > /etc/skel/.gtkrc-2.0 <<'EOF' -gtk-theme-name="Mist" +gtk-icon-theme-name="Tango" +gtk-theme-name="AdwaitaDark" gtk-font-name="Sans 10" gtk-toolbar-style=GTK_TOOLBAR_ICONS gtk-button-images=0