airship
/
deckhand
Code Issues Proposed changes

Sort package list in Dockerfiles 

Sort the list of apt/zypper packages in Dockerfiles to make it obvious
where to insert new ones.

Change-Id: Ib1d890dbea88c009c067ffd8bc9cc9175979ed32
This commit is contained in:
Phil Sphicas 2020-09-09 02:18:35 +00:00
parent 1b396f220a
commit 0325f82d55
3 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
images/deckhand/Dockerfile.opensuse_15
View File

@ -31,23 +31,23 @@ EXPOSE $PORT
RUN set -x && \ RUN set -x && \
zypper -q update -y && \ zypper -q update -y && \
zypper install -y --no-recommends \ zypper install -y --no-recommends \
git \
curl \
netcat-openbsd \
netcfg \
python3 \
python3-setuptools \
python3-pip \
python3-devel \
python3-python-dateutil \
python3-dbm \
ca-certificates \ ca-certificates \
curl \
gcc \ gcc \
gcc-c++ \ gcc-c++ \
make \ git \
libffi-devel \ libffi-devel \
libopenssl-devel \ libopenssl-devel \
libpqxx-devel \ libpqxx-devel \
make \
netcat-openbsd \
netcfg \
python3 \
python3-dbm \
python3-devel \
python3-pip \
python3-python-dateutil \
python3-setuptools \
&& zypper --non-interactive ar -f https://download.opensuse.org/repositories/devel:languages:python/openSUSE_Leap_15.1/devel:languages:python.repo \ && zypper --non-interactive ar -f https://download.opensuse.org/repositories/devel:languages:python/openSUSE_Leap_15.1/devel:languages:python.repo \
&& zypper --non-interactive --gpg-auto-import-keys refresh devel_languages_python \ && zypper --non-interactive --gpg-auto-import-keys refresh devel_languages_python \
&& zypper --non-interactive install python3-six-1.11.0-lp151.3.1.noarch && zypper --non-interactive install python3-six-1.11.0-lp151.3.1.noarch

24
images/deckhand/Dockerfile.ubuntu_bionic
View File

@ -32,22 +32,22 @@ EXPOSE $PORT
RUN set -x && \ RUN set -x && \
apt-get -qq update && \ apt-get -qq update && \
apt-get -y install \ apt-get -y install \
git \
curl \
netcat \
netbase \
python3 \
python3-setuptools \
python3-pip \
python3-dev \
python3-dateutil \
ca-certificates \ ca-certificates \
gcc \ curl \
g++ \ g++ \
make \ gcc \
git \
libffi-dev \ libffi-dev \
libssl-dev \
libpq-dev \ libpq-dev \
libssl-dev \
make \
netbase \
netcat \
python3 \
python3-dateutil \
python3-dev \
python3-pip \
python3-setuptools \
--no-install-recommends \ --no-install-recommends \
&& python3 -m pip install -U pip \ && python3 -m pip install -U pip \
&& apt-get clean \ && apt-get clean \

24
images/deckhand/Dockerfile.ubuntu_xenial
View File

@ -32,22 +32,22 @@ EXPOSE $PORT
RUN set -x && \ RUN set -x && \
apt-get -qq update && \ apt-get -qq update && \
apt-get -y install \ apt-get -y install \
git \
curl \
netcat \
netbase \
python3 \
python3-setuptools \
python3-pip \
python3-dev \
python3-dateutil \
ca-certificates \ ca-certificates \
gcc \ curl \
g++ \ g++ \
make \ gcc \
git \
libffi-dev \ libffi-dev \
libssl-dev \
libpq-dev \ libpq-dev \
libssl-dev \
make \
netbase \
netcat \
python3 \
python3-dateutil \
python3-dev \
python3-pip \
python3-setuptools \
--no-install-recommends \ --no-install-recommends \
&& python3 -m pip install -U pip \ && python3 -m pip install -U pip \
&& apt-get clean \ && apt-get clean \