From ce3791a214f69b6f0310bfe1d5bcc12ac6927c49 Mon Sep 17 00:00:00 2001 From: Ryan Chu Date: Mon, 3 Dec 2018 13:14:04 +0100 Subject: [PATCH] Docker Provisioning: Remove the fixed version of package dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Free the dependencies of the specific Ubuntu packages. Ensure that test server is using the latest version of the Ubuntu packages to test network changes. The SHA-1 of the provisioned images in docker cache: qt-test-server-apache2:537fe302f61851d1663f41495230d8e3554a4a13 qt-test-server-squid:9c32f41b19aca3d778733c4d8fb0ecc5955e893c qt-test-server-vsftpd:f3a9c8d793a77cc007c0e4e481bec01f9e3eeb7e qt-test-server-ftp-proxy:d7de8b28392d173db512a558ccc84ead8bece2ae qt-test-server-danted:35607f9b790524cf9690c7d12a9a401696b7b6b5 Change-Id: I4e6c8cb235f1f798274eb52858e06d8755ae626f Reviewed-by: Jędrzej Nowacki --- coin/provisioning/common/shared/testserver/apache2/Dockerfile | 3 ++- coin/provisioning/common/shared/testserver/danted/Dockerfile | 3 ++- .../provisioning/common/shared/testserver/ftp-proxy/Dockerfile | 3 ++- coin/provisioning/common/shared/testserver/squid/Dockerfile | 3 ++- coin/provisioning/common/shared/testserver/vsftpd/Dockerfile | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/coin/provisioning/common/shared/testserver/apache2/Dockerfile b/coin/provisioning/common/shared/testserver/apache2/Dockerfile index bb2dc850..b39eb21e 100644 --- a/coin/provisioning/common/shared/testserver/apache2/Dockerfile +++ b/coin/provisioning/common/shared/testserver/apache2/Dockerfile @@ -1,5 +1,6 @@ FROM ubuntu:16.04 -RUN apt-get update && apt-get install -y apache2 libcgi-session-perl wget avahi-daemon +ARG packages="apache2 libcgi-session-perl wget avahi-daemon" +RUN apt-get update && apt-get install -y $packages && dpkg -l $packages EXPOSE 80 443 # install configurations and test data diff --git a/coin/provisioning/common/shared/testserver/danted/Dockerfile b/coin/provisioning/common/shared/testserver/danted/Dockerfile index eb2ac6ff..67c1159b 100644 --- a/coin/provisioning/common/shared/testserver/danted/Dockerfile +++ b/coin/provisioning/common/shared/testserver/danted/Dockerfile @@ -1,5 +1,6 @@ FROM ubuntu:16.04 -RUN apt-get update && apt-get install -y gdebi-core=0.9.5.7ubuntu1 wget avahi-daemon +ARG packages="gdebi-core wget avahi-daemon" +RUN apt-get update && apt-get install -y $packages && dpkg -l $packages RUN wget http://ppa.launchpad.net/dajhorn/dante/ubuntu/pool/main/d/dante/dante-server_1.4.1-1_amd64.deb RUN gdebi -n dante-server_1.4.1-1_amd64.deb EXPOSE 1080-1081 diff --git a/coin/provisioning/common/shared/testserver/ftp-proxy/Dockerfile b/coin/provisioning/common/shared/testserver/ftp-proxy/Dockerfile index cecb2dca..c719c1eb 100644 --- a/coin/provisioning/common/shared/testserver/ftp-proxy/Dockerfile +++ b/coin/provisioning/common/shared/testserver/ftp-proxy/Dockerfile @@ -1,3 +1,4 @@ FROM ubuntu:16.04 -RUN apt-get update && apt-get install -y ftp-proxy=1.9.2.4-10 avahi-daemon +ARG packages="ftp-proxy avahi-daemon" +RUN apt-get update && apt-get install -y $packages && dpkg -l $packages EXPOSE 2121 diff --git a/coin/provisioning/common/shared/testserver/squid/Dockerfile b/coin/provisioning/common/shared/testserver/squid/Dockerfile index 0b930bca..f0ed68b3 100644 --- a/coin/provisioning/common/shared/testserver/squid/Dockerfile +++ b/coin/provisioning/common/shared/testserver/squid/Dockerfile @@ -1,3 +1,4 @@ FROM ubuntu:16.04 -RUN apt-get update && apt-get install -y squid=3.5.12-1ubuntu7.5 avahi-daemon +ARG packages="squid avahi-daemon" +RUN apt-get update && apt-get install -y $packages && dpkg -l $packages EXPOSE 3128-3130 diff --git a/coin/provisioning/common/shared/testserver/vsftpd/Dockerfile b/coin/provisioning/common/shared/testserver/vsftpd/Dockerfile index f8e32d40..af6cd7c7 100644 --- a/coin/provisioning/common/shared/testserver/vsftpd/Dockerfile +++ b/coin/provisioning/common/shared/testserver/vsftpd/Dockerfile @@ -1,5 +1,6 @@ FROM ubuntu:16.04 -RUN apt-get update && apt-get install -y vsftpd=3.0.3-3ubuntu2 ftp=0.17-33 wget avahi-daemon +ARG packages="vsftpd ftp wget avahi-daemon" +RUN apt-get update && apt-get install -y $packages && dpkg -l $packages EXPOSE 20-21 # install configurations and test data