From 757a9beb66f30ea87dd441a6b9f13fdd65df0800 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Mon, 6 Jan 2020 11:31:22 +0000 Subject: [PATCH] tools/docker: reorder to match checkdeps --- tools/docker/bionic/Dockerfile | 7 +++---- tools/docker/eoan/Dockerfile | 7 +++---- tools/docker/stretch/Dockerfile | 7 +++---- tools/docker/xenial/Dockerfile | 7 +++---- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/tools/docker/bionic/Dockerfile b/tools/docker/bionic/Dockerfile index 2e780bdf96..9a16f51ea8 100644 --- a/tools/docker/bionic/Dockerfile +++ b/tools/docker/bionic/Dockerfile @@ -18,11 +18,10 @@ RUN adduser --disabled-password --gecos '' docker \ && echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers RUN apt-get update && apt-get install -y \ - wget bash bc gcc sed patch patchutils tar bzip2 gzip perl gawk gperf zip unzip diffutils lzop python3 \ - g++ xfonts-utils xsltproc default-jre-headless \ + wget bash bc gcc sed patch patchutils tar bzip2 gzip xz-utils perl gawk gperf zip unzip diffutils lzop make file \ + g++ xfonts-utils xsltproc default-jre-headless python3 \ libc6-dev libncurses5-dev \ - xz-utils make file libxml-parser-perl \ - libjson-perl \ + libjson-perl libxml-parser-perl \ golang-go \ git openssh-client \ --no-install-recommends \ diff --git a/tools/docker/eoan/Dockerfile b/tools/docker/eoan/Dockerfile index bbf03af8ac..2929fcc036 100644 --- a/tools/docker/eoan/Dockerfile +++ b/tools/docker/eoan/Dockerfile @@ -18,11 +18,10 @@ RUN adduser --disabled-password --gecos '' docker \ && echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers RUN apt-get update && apt-get install -y \ - wget bash bc gcc sed patch patchutils tar bzip2 gzip perl gawk gperf zip unzip diffutils lzop python3 \ - g++ xfonts-utils xsltproc default-jre-headless \ + wget bash bc gcc sed patch patchutils tar bzip2 gzip xz-utils perl gawk gperf zip unzip diffutils lzop make file \ + g++ xfonts-utils xsltproc default-jre-headless python3 \ libc6-dev libncurses5-dev \ - xz-utils make file libxml-parser-perl \ - libjson-perl \ + libjson-perl libxml-parser-perl \ golang-go \ git openssh-client \ --no-install-recommends \ diff --git a/tools/docker/stretch/Dockerfile b/tools/docker/stretch/Dockerfile index 4a341bff8f..ebbab01ac5 100644 --- a/tools/docker/stretch/Dockerfile +++ b/tools/docker/stretch/Dockerfile @@ -19,11 +19,10 @@ RUN adduser --disabled-password --gecos '' docker \ && echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers RUN apt-get update && apt-get install -y \ - wget bash bc gcc sed patch patchutils tar bzip2 gzip perl gawk gperf zip unzip diffutils lzop python3 \ - g++ xfonts-utils xsltproc default-jre-headless \ + wget bash bc gcc sed patch patchutils tar bzip2 gzip xz-utils perl gawk gperf zip unzip diffutils lzop make file \ + g++ xfonts-utils xsltproc default-jre-headless python3 \ libc6-dev libncurses5-dev \ - xz-utils make file libxml-parser-perl \ - libjson-perl \ + libjson-perl libxml-parser-perl \ golang-go \ git openssh-client \ --no-install-recommends \ diff --git a/tools/docker/xenial/Dockerfile b/tools/docker/xenial/Dockerfile index a06831fe77..574031a7c1 100644 --- a/tools/docker/xenial/Dockerfile +++ b/tools/docker/xenial/Dockerfile @@ -18,11 +18,10 @@ RUN adduser --disabled-password --gecos '' docker \ && echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers RUN apt-get update && apt-get install -y \ - wget bash bc gcc sed patch patchutils tar bzip2 gzip perl gawk gperf zip unzip diffutils lzop python3 \ - g++ xfonts-utils xsltproc default-jre-headless \ + wget bash bc gcc sed patch patchutils tar bzip2 gzip xz-utils perl gawk gperf zip unzip diffutils lzop make file \ + g++ xfonts-utils xsltproc default-jre-headless python3 \ libc6-dev libncurses5-dev \ - xz-utils make file libxml-parser-perl \ - libjson-perl \ + libjson-perl libxml-parser-perl \ golang-go \ git openssh-client \ --no-install-recommends \