From 3c709e90d26e7f19f96d19c9f6e932789dbf84d9 Mon Sep 17 00:00:00 2001 From: Dmitry Maksyoma Date: Tue, 7 Sep 2021 00:23:19 +1200 Subject: [PATCH] Deb: ensure test-deb picks up non-tagged package if tag isn't given --- builder/dockerfile.debian_bullseye.deb.test | 4 ++-- builder/dockerfile.debian_buster.barebones.deb.test | 4 ++-- builder/dockerfile.debian_buster.deb.test | 4 ++-- builder/dockerfile.kali_kali-rolling.deb.test | 4 ++-- builder/dockerfile.ubuntu_bionic.deb.test | 4 ++-- builder/dockerfile.ubuntu_focal.barebones.deb.test | 4 ++-- builder/dockerfile.ubuntu_focal.deb.test | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/builder/dockerfile.debian_bullseye.deb.test b/builder/dockerfile.debian_bullseye.deb.test index 3ad2600..90ee85d 100644 --- a/builder/dockerfile.debian_bullseye.deb.test +++ b/builder/dockerfile.debian_bullseye.deb.test @@ -42,8 +42,8 @@ COPY startup/ $STARTUPDIR ### START CUSTOM STUFF #### ARG KASMVNC_PACKAGE_DIR -COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp -RUN dpkg -i /tmp/*.deb; apt-get -yf install +COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp/ +RUN rm -f /tmp/kasmvncserver_*+*.deb; dpkg -i /tmp/*.deb; apt-get -yf install ### END CUSTOM STUFF ### diff --git a/builder/dockerfile.debian_buster.barebones.deb.test b/builder/dockerfile.debian_buster.barebones.deb.test index 12049c6..43147af 100644 --- a/builder/dockerfile.debian_buster.barebones.deb.test +++ b/builder/dockerfile.debian_buster.barebones.deb.test @@ -1,8 +1,8 @@ FROM debian:buster-slim ARG KASMVNC_PACKAGE_DIR -COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp -RUN apt-get update && dpkg -i /tmp/*.deb; apt-get -yf install +COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp/ +RUN rm -f /tmp/kasmvncserver_*+*.deb; apt-get update && dpkg -i /tmp/*.deb; apt-get -yf install RUN apt-get update && apt-get -y install xterm COPY startup/deb/kasmvncserver-easy-start /usr/local/bin diff --git a/builder/dockerfile.debian_buster.deb.test b/builder/dockerfile.debian_buster.deb.test index ef536ea..5b3753c 100644 --- a/builder/dockerfile.debian_buster.deb.test +++ b/builder/dockerfile.debian_buster.deb.test @@ -42,8 +42,8 @@ COPY startup/ $STARTUPDIR ### START CUSTOM STUFF #### ARG KASMVNC_PACKAGE_DIR -COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp -RUN dpkg -i /tmp/*.deb; apt-get -yf install +COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp/ +RUN rm -f /tmp/kasmvncserver_*+*.deb; dpkg -i /tmp/*.deb; apt-get -yf install ### END CUSTOM STUFF ### diff --git a/builder/dockerfile.kali_kali-rolling.deb.test b/builder/dockerfile.kali_kali-rolling.deb.test index a189b9b..5d95f99 100644 --- a/builder/dockerfile.kali_kali-rolling.deb.test +++ b/builder/dockerfile.kali_kali-rolling.deb.test @@ -42,8 +42,8 @@ COPY startup/ $STARTUPDIR ### START CUSTOM STUFF #### ARG KASMVNC_PACKAGE_DIR -COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp -RUN dpkg -i /tmp/*.deb; apt-get -yf install +COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp/ +RUN rm -f /tmp/kasmvncserver_*+*.deb; dpkg -i /tmp/*.deb; apt-get -yf install ### END CUSTOM STUFF ### diff --git a/builder/dockerfile.ubuntu_bionic.deb.test b/builder/dockerfile.ubuntu_bionic.deb.test index 793c2ca..7230475 100644 --- a/builder/dockerfile.ubuntu_bionic.deb.test +++ b/builder/dockerfile.ubuntu_bionic.deb.test @@ -42,8 +42,8 @@ COPY startup/ $STARTUPDIR ### START CUSTOM STUFF #### ARG KASMVNC_PACKAGE_DIR -COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp -RUN dpkg -i /tmp/*.deb; apt-get -yf install +COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp/ +RUN rm -f /tmp/kasmvncserver_*+*.deb; dpkg -i /tmp/*.deb; apt-get -yf install ### END CUSTOM STUFF ### diff --git a/builder/dockerfile.ubuntu_focal.barebones.deb.test b/builder/dockerfile.ubuntu_focal.barebones.deb.test index 26b0c14..ae046ad 100644 --- a/builder/dockerfile.ubuntu_focal.barebones.deb.test +++ b/builder/dockerfile.ubuntu_focal.barebones.deb.test @@ -1,8 +1,8 @@ FROM ubuntu:focal ARG KASMVNC_PACKAGE_DIR -COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp -RUN apt-get update && dpkg -i /tmp/*.deb; apt-get -yf install +COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp/ +RUN rm -f /tmp/kasmvncserver_*+*.deb; apt-get update && dpkg -i /tmp/*.deb; apt-get -yf install RUN apt-get update && apt-get -y install xterm lsb-release RUN useradd -m foo && addgroup foo ssl-cert diff --git a/builder/dockerfile.ubuntu_focal.deb.test b/builder/dockerfile.ubuntu_focal.deb.test index 3397848..867dbd7 100644 --- a/builder/dockerfile.ubuntu_focal.deb.test +++ b/builder/dockerfile.ubuntu_focal.deb.test @@ -42,8 +42,8 @@ COPY startup/ $STARTUPDIR ### START CUSTOM STUFF #### ARG KASMVNC_PACKAGE_DIR -COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp -RUN dpkg -i /tmp/*.deb; apt-get -yf install +COPY $KASMVNC_PACKAGE_DIR/kasmvncserver_*.deb /tmp/ +RUN rm -f /tmp/kasmvncserver_*+*.deb; dpkg -i /tmp/*.deb; apt-get -yf install RUN mkdir ~/.vnc && echo '/usr/bin/xfce4-session &' >> ~/.vnc/xstartup && \ chmod +x ~/.vnc/xstartup