[buildbot] docker: alphabetical sorting of packages

LEDE Commits lede-commits at lists.infradead.org
Thu Jan 14 16:05:42 EST 2021


ynezz pushed a commit to buildbot.git, branch staging/ynezz/buildbot-2.10.0:
https://git.openwrt.org/048d82d7b63e5fe3c6f6d7a9bec7eae9183764b9

commit 048d82d7b63e5fe3c6f6d7a9bec7eae9183764b9
Author: Petr Štetiar <ynezz at true.cz>
AuthorDate: Thu Jan 14 16:22:17 2021 +0100

    docker: alphabetical sorting of packages
    
    So it's easier to follow.
    
    Signed-off-by: Petr Štetiar <ynezz at true.cz>
---
 docker/buildmaster/Dockerfile |  8 ++++----
 docker/buildslave/Dockerfile  | 22 +++++++++++-----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/docker/buildmaster/Dockerfile b/docker/buildmaster/Dockerfile
index 6ebea8a..a50296a 100644
--- a/docker/buildmaster/Dockerfile
+++ b/docker/buildmaster/Dockerfile
@@ -12,15 +12,15 @@ USER root
 RUN \
 	apt-get update && \
 	apt-get install -y \
-		pwgen \
-		locales \
 		build-essential \
-		libncurses5-dev \
 		gawk \
 		git-core \
-		pv \
 		gosu \
+		libncurses5-dev \
+		locales \
 		signify-openbsd \
+		pv \
+		pwgen \
 		python3-pip \
 		wget && \
 	apt-get clean && \
diff --git a/docker/buildslave/Dockerfile b/docker/buildslave/Dockerfile
index 509352d..405183a 100644
--- a/docker/buildslave/Dockerfile
+++ b/docker/buildslave/Dockerfile
@@ -13,23 +13,23 @@ USER root
 RUN \
 	apt-get update && \
 	apt-get install -y \
-		pwgen \
-		locales \
 		build-essential \
-		git-core \
-		subversion \
-		libncurses5-dev \
+		ccache \
+		curl \
 		gawk \
-		unzip \
-		pv \
+		git-core \
 		gosu \
+		libncurses5-dev \
+		locales \
+		rsync \
 		signify-openbsd \
+		subversion \
+		pv \
+		pwgen \
 		python3 \
 		python3-pip \
-		wget \
-		curl \
-		ccache \
-		rsync && \
+		unzip \
+		wget && \
 	apt-get clean && \
 	localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
 



More information about the lede-commits mailing list