From 3b7189f1652c197c606b0f82f3802ba136989b38 Mon Sep 17 00:00:00 2001 From: hackercat Date: Fri, 22 Jan 2021 07:15:15 +0000 Subject: [PATCH] Move installed packages printing --- linux/ubuntu/act/Dockerfile | 6 +++--- linux/ubuntu/runner/Dockerfile | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/linux/ubuntu/act/Dockerfile b/linux/ubuntu/act/Dockerfile index 9a42358..fb1afec 100644 --- a/linux/ubuntu/act/Dockerfile +++ b/linux/ubuntu/act/Dockerfile @@ -38,8 +38,7 @@ RUN set -Eeuxo pipefail && \ apt -yq update && \ printf "Updated apt lists and upgraded packages\n\n" && \ apt -yq install --no-install-recommends ssh lsb-release gawk jq curl git wget sudo gnupg-agent ca-certificates software-properties-common apt-transport-https libyaml-0-2 zstd unzip && \ - printf "Installed base utils" && \ - dpkg-query -f '${binary:Package}\n' -W && \ + printf "Installed base utils\n" && \ printf "Cleaning image" && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* && \ @@ -55,7 +54,8 @@ RUN set -Eeuxo pipefail && \ echo "deb-src https://deb.nodesource.com/node_${NODE_VERSION}.x $DISTRO main" | tee -a /etc/apt/sources.list.d/nodesource.list && \ apt -yq update && \ apt -yq install --no-install-recommends nodejs="${NODE_VERSION}*" && \ - printf "Installed Node.JS $(node -v)" && \ + printf "Installed Node.JS $(node -v)\n" && \ + dpkg-query -f '${binary:Package}\n' -W && \ printf "Cleaning image" && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* && \ diff --git a/linux/ubuntu/runner/Dockerfile b/linux/ubuntu/runner/Dockerfile index e6545f4..83932e0 100644 --- a/linux/ubuntu/runner/Dockerfile +++ b/linux/ubuntu/runner/Dockerfile @@ -40,8 +40,7 @@ RUN set -Eeuxo pipefail && \ apt -yq update && \ printf "Updated apt lists and upgraded packages\n\n" && \ apt -yq install --no-install-recommends lsb-release gawk jq curl git wget sudo gnupg-agent ca-certificates software-properties-common apt-transport-https zstd unzip && \ - printf "Installed base utils" && \ - dpkg-query -f '${binary:Package}\n' -W && \ + printf "Installed base utils\n" && \ printf "Cleaning image" && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* && \ @@ -57,7 +56,8 @@ RUN set -Eeuxo pipefail && \ echo "deb-src https://deb.nodesource.com/node_${NODE_VERSION}.x $DISTRO main" | tee -a /etc/apt/sources.list.d/nodesource.list && \ apt -yq update && \ apt -yq install --no-install-recommends nodejs="${NODE_VERSION}*" && \ - printf "Installed Node.JS $(node -v)" && \ + printf "Installed Node.JS $(node -v)\n" && \ + dpkg-query -f '${binary:Package}\n' -W && \ printf "Cleaning image" && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* && \