Update `kiss` inside the container

diff --git a/kiss/2020.9-2/Dockerfile b/kiss/2020.9-2/Dockerfile
index 89e3fec846a93989c9e863568414a7b40cce01ab..d57b62c3be106ef8c2eacfbef2fa27059b5ebdbf 100644 (file)
--- a/kiss/2020.9-2/Dockerfile
+++ b/kiss/2020.9-2/Dockerfile
@@ -3,12 +3,14 @@ ENV url=https://github.com/kisslinux/repo/releases/download/2020.9-2
 ENV version=2020.9-2
 RUN mkdir /build
 WORKDIR /build
 ENV version=2020.9-2
 RUN mkdir /build
 WORKDIR /build

-RUN apt-get update && apt-get install -y wget gpg xz-utils 
-RUN wget "$url/kiss-chroot-$version.tar.xz" -O /build/kiss-chroot-$version.tar.xz
-RUN wget "$url/kiss-chroot-$version.tar.xz.sha256"
+RUN apt-get update && apt-get install -y wget gpg xz-utils
+RUN wget -q "$url/kiss-chroot-$version.tar.xz" -O \
+  /build/kiss-chroot-$version.tar.xz
+RUN wget -q "$url/kiss-chroot-$version.tar.xz.sha256"

 RUN sha256sum -c < kiss-chroot-2020.9-2.tar.xz.sha256
 RUN sha256sum -c < kiss-chroot-2020.9-2.tar.xz.sha256

-RUN wget "$url/kiss-chroot-$version.tar.xz.asc"
-RUN gpg --keyserver keys.gnupg.net --recv-key 46D62DD9F1DE636E || gpg --keyserver pgp.mit.edu --recv-key 46D62DD9F1DE636E
+RUN wget -q "$url/kiss-chroot-$version.tar.xz.asc"
+RUN gpg --keyserver keys.gnupg.net --recv-key 46D62DD9F1DE636E \
+  || gpg --keyserver pgp.mit.edu --recv-key 46D62DD9F1DE636E

 RUN gpg --verify "kiss-chroot-$version.tar.xz.asc"
 WORKDIR /mnt
 RUN tar xvf /build/kiss-chroot-$version.tar.xz
 RUN gpg --verify "kiss-chroot-$version.tar.xz.asc"
 WORKDIR /mnt
 RUN tar xvf /build/kiss-chroot-$version.tar.xz


@@ -19,12 +21,15 @@ RUN git config --global pull.ff only
 RUN git clone https://github.com/kisslinux/repo /usr/repos/official
 RUN git clone https://github.com/kisslinux/community /usr/repos/community
 ENV KISS_PATH="/usr/repos/official/core:/usr/repos/official/extra:/usr/repos/official/testing:/usr/repos/official/xorg:/usr/repos/community/community"
 RUN git clone https://github.com/kisslinux/repo /usr/repos/official
 RUN git clone https://github.com/kisslinux/community /usr/repos/community
 ENV KISS_PATH="/usr/repos/official/core:/usr/repos/official/extra:/usr/repos/official/testing:/usr/repos/official/xorg:/usr/repos/community/community"

+RUN sed -i "s/\/dev\/tty/\/dev\/null/g" /sbin/kiss

 ENV KISS_PROMPT="0"
 ENV KISS_PROMPT="0"

-RUN kiss b gnupg1 && kiss i gnupg1
-RUN gpg --keyserver keys.gnupg.net --recv-key 46D62DD9F1DE636E || gpg --keyserver pgp.mit.edu --recv-key 46D62DD9F1DE636E
+RUN kiss update
+RUN kiss build gnupg1 && kiss install gnupg1
+RUN gpg --keyserver keys.gnupg.net --recv-key 46D62DD9F1DE636E \
+  || gpg --keyserver pgp.mit.edu --recv-key 46D62DD9F1DE636E

 RUN echo trusted-key 0x46d62dd9f1de636e >> /root/.gnupg/gpg.conf
 WORKDIR /usr/repos/official
 RUN git config merge.verifySignatures true
 RUN echo trusted-key 0x46d62dd9f1de636e >> /root/.gnupg/gpg.conf
 WORKDIR /usr/repos/official
 RUN git config merge.verifySignatures true

-RUN sed -i "s/\/dev\/tty/\/dev\/null/g" /sbin/kiss
+RUN kiss build kiss && kiss install kiss

 WORKDIR /
 CMD ash
 WORKDIR /
 CMD ash