[archiva] 01/02: Reducing docker image size

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git

commit 240ea426e7bed3d70fcee86c8bf58945c9805793
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sat Apr 7 15:03:46 2018 +0200

    Reducing docker image size
---
 src/ci/docker/webtest/Dockerfile    | 23 ++++++++++-------------
 src/ci/scripts/container_webtest.sh |  2 +-
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/ci/docker/webtest/Dockerfile b/src/ci/docker/webtest/Dockerfile
index 79a383c..1c3e47f 100644
--- a/src/ci/docker/webtest/Dockerfile
+++ b/src/ci/docker/webtest/Dockerfile
@@ -28,12 +28,14 @@ MAINTAINER Apache Archiva <de...@archiva.apache.org>
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV DEBCONF_NONINTERACTIVE_SEEN true
-
 ARG CHROME_VERSION=google-chrome-stable
-RUN apt-get -qqy update 
+ARG CHROME_DRIVER_VERSION=2.37
+ARG SELENIUM_VERSION=2.53.1
+
+RUN apt-get -qqy update
 RUN apt-get -qqy install apt-utils >/dev/null 2>&1
 RUN apt-get -qqy install wget unzip >/dev/null
-RUN apt-get -qqy upgrade
+RUN apt-get -qqy upgrade && apt-get -qqy autoremove >/dev/null
 RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
   && echo "deb http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list \
   && apt-get -qqy update \
@@ -41,8 +43,6 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key
     $CHROME_VERSION \
   >/dev/null
 
-
-ARG CHROME_DRIVER_VERSION=2.37
 RUN wget --no-verbose -O /tmp/chromedriver_linux64.zip https://chromedriver.storage.googleapis.com/$CHROME_DRIVER_VERSION/chromedriver_linux64.zip \
   && rm -rf /opt/selenium/chromedriver \
   && unzip /tmp/chromedriver_linux64.zip -d /opt/selenium \
@@ -52,16 +52,13 @@ RUN wget --no-verbose -O /tmp/chromedriver_linux64.zip https://chromedriver.stor
   && ln -fs /opt/selenium/chromedriver-$CHROME_DRIVER_VERSION /usr/bin/chromedriver \
   >/dev/null
 
-RUN apt-get -qqy install openjdk-8-jdk xvfb dbus locales fluxbox >/dev/null \
-  && rm -rf /var/lib/apt/lists/* /var/cache/apt/* \
-  >/dev/null
-
-RUN apt-get -qqy purge perl \
-  && apt-get -qqy autoremove
+RUN apt-get -qqy install openjdk-8-jre-headless xvfb dbus locales fluxbox \
+  && apt-get -qqy purge perl libtext-iconv-perl cpp-5 Libperl5.22 libx11-doc libsane fonts-dejavu-extra xfonts-base libsane-common iproute2 krb5-locales ifupdown \
+  && apt-get -qqy autoremove \
+  && rm -rf /var/lib/apt/lists/* /var/cache/apt/* >/dev/null
 
-ARG SELENIUM_VERSION=2.53.1
 RUN mkdir -p /opt/bin && wget --no-verbose -O /opt/bin/selenium-server-standalone.jar https://selenium-release.storage.googleapis.com/2.53/selenium-server-standalone-$SELENIUM_VERSION.jar \
-  && chmod 644 /opt/bin/selenium-server-standalone.jar
+  && chmod 644 /opt/bin/selenium-server-standalone.jar >/dev/null
 
 COPY entry_point.sh /opt/bin/entry_point.sh
 COPY x_run.sh /opt/bin/x_run.sh
diff --git a/src/ci/scripts/container_webtest.sh b/src/ci/scripts/container_webtest.sh
index e5020c4..36818d0 100755
--- a/src/ci/scripts/container_webtest.sh
+++ b/src/ci/scripts/container_webtest.sh
@@ -38,7 +38,7 @@
 #
 
 # Always change the version, if your Dockerfile or scripts of the container change
-CONTAINER_VERSION="1.1"
+CONTAINER_VERSION="1.2"
 CONTAINER_NAME="archiva/selenium"
 DOCKER_CFG="webtest"
 INSTANCE_NAME="archiva-webtest"

-- 
To stop receiving notification emails like this one, please contact
martin_s@apache.org.