diff --git a/base/10/Dockerfile b/base/10/Dockerfile index b75b87ea82..b12070f086 100644 --- a/base/10/Dockerfile +++ b/base/10/Dockerfile @@ -1,14 +1,16 @@ FROM node:10.13 RUN apt-get update && \ - apt-get install -y \ + apt-get install --no-install-recommends -y \ libgtk2.0-0 \ libnotify-dev \ libgconf-2-4 \ libnss3 \ libxss1 \ libasound2 \ - xvfb + libxtst6 \ + xvfb && \ + rm -rf /var/lib/apt/lists/* # versions of local tools RUN node -v diff --git a/base/4/Dockerfile b/base/4/Dockerfile index 4298ce4f85..e708fdc010 100644 --- a/base/4/Dockerfile +++ b/base/4/Dockerfile @@ -1,11 +1,13 @@ FROM node:4.8.4 RUN apt-get update && \ - apt-get install -y \ + apt-get install --no-install-recommends -y \ libgtk2.0-0 \ libnotify-dev \ libgconf-2-4 \ libnss3 \ libxss1 \ libasound2 \ - xvfb + libxtst6 \ + xvfb && \ + rm -rf /var/lib/apt/lists/* diff --git a/base/6/Dockerfile b/base/6/Dockerfile index ae212250ed..38361ca731 100644 --- a/base/6/Dockerfile +++ b/base/6/Dockerfile @@ -1,14 +1,16 @@ FROM node:6.14 RUN apt-get update && \ - apt-get install -y \ + apt-get install --no-install-recommends -y \ libgtk2.0-0 \ libnotify-dev \ libgconf-2-4 \ libnss3 \ libxss1 \ libasound2 \ - xvfb + libxtst6 \ + xvfb && \ + rm -rf /var/lib/apt/lists/* # versions of local tools RUN node -v diff --git a/base/8/Dockerfile b/base/8/Dockerfile index 7c48e66ea6..628362695f 100644 --- a/base/8/Dockerfile +++ b/base/8/Dockerfile @@ -1,14 +1,16 @@ FROM node:8.12 RUN apt-get update && \ - apt-get install -y \ + apt-get install --no-install-recommends -y \ libgtk2.0-0 \ libnotify-dev \ libgconf-2-4 \ libnss3 \ libxss1 \ libasound2 \ - xvfb + libxtst6 \ + xvfb && \ + rm -rf /var/lib/apt/lists/* RUN npm install -g npm@6.4.1 diff --git a/base/ubuntu16/Dockerfile b/base/ubuntu16/Dockerfile index 619f603aba..3037cfb578 100644 --- a/base/ubuntu16/Dockerfile +++ b/base/ubuntu16/Dockerfile @@ -1,31 +1,32 @@ FROM ubuntu:16.04 RUN apt-get update && \ - apt-get install -y apt-transport-https curl + apt-get install --no-install-recommends -y \ + apt-transport-https \ + ca-certificates \ + curl && \ + rm -rf /var/lib/apt/lists/* RUN touch /etc/apt/sources.list.d/nodesource.list RUN echo "deb https://deb.nodesource.com/node_6.x xenial main" > /etc/apt/sources.list.d/nodesource.list RUN echo "deb-src https://deb.nodesource.com/node_6.x xenial main" >> /etc/apt/sources.list.d/nodesource.list RUN curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - -RUN apt-get update # Should install Node 6 -RUN apt-get install -y nodejs - # Install Git client -RUN apt-get update && apt-get install -y git -RUN git --version - -# Install Cypress dependencies (separate commands to avoid time outs) -RUN apt-get install -y \ - libgtk2.0-0 -RUN apt-get install -y \ - libnotify-dev -RUN apt-get install -y \ +RUN apt-get update && \ + apt-get install --no-install-recommends -y \ + nodejs \ + git \ + libgtk2.0-0 \ + libnotify-dev \ libgconf-2-4 \ libnss3 \ - libxss1 -RUN apt-get install -y \ + libxss1 \ libasound2 \ - xvfb + libxtst6 \ + xvfb && \ + rm -rf /var/lib/apt/lists/* + +RUN git --version diff --git a/browsers/chrome63-ff57/Dockerfile b/browsers/chrome63-ff57/Dockerfile index 93379e79b2..49b8191789 100644 --- a/browsers/chrome63-ff57/Dockerfile +++ b/browsers/chrome63-ff57/Dockerfile @@ -12,7 +12,10 @@ 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.list && \ apt-get update && \ - apt-get install -y dbus-x11 google-chrome-stable && \ + apt-get install --no-install-recommends -y \ + dbus-x11 \ + google-chrome-stable \ + zip && \ rm -rf /var/lib/apt/lists/* # "fake" dbus address to prevent errors @@ -25,9 +28,6 @@ RUN wget --no-verbose -O /tmp/firefox.tar.bz2 https://download-installer.cdn.moz && rm /tmp/firefox.tar.bz2 \ && ln -fs /opt/firefox/firefox /usr/bin/firefox -# Add zip utility - it comes in very handy -RUN apt-get update && apt-get install -y zip - # versions of local tools RUN google-chrome --version RUN firefox --version diff --git a/browsers/chrome65-ff57/Dockerfile b/browsers/chrome65-ff57/Dockerfile index 2fdabfc3da..5147f7fb04 100644 --- a/browsers/chrome65-ff57/Dockerfile +++ b/browsers/chrome65-ff57/Dockerfile @@ -12,7 +12,10 @@ 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.list && \ apt-get update && \ - apt-get install -y dbus-x11 google-chrome-stable && \ + apt-get install --no-install-recommends -y \ + dbus-x11 \ + google-chrome-stable \ + zip && \ rm -rf /var/lib/apt/lists/* # "fake" dbus address to prevent errors @@ -25,9 +28,6 @@ RUN wget --no-verbose -O /tmp/firefox.tar.bz2 https://download-installer.cdn.moz && rm /tmp/firefox.tar.bz2 \ && ln -fs /opt/firefox/firefox /usr/bin/firefox -# Add zip utility - it comes in very handy -RUN apt-get update && apt-get install -y zip - # versions of local tools RUN google-chrome --version RUN firefox --version diff --git a/browsers/chrome67-ff57/Dockerfile b/browsers/chrome67-ff57/Dockerfile index 97cf6f840c..65339e924e 100644 --- a/browsers/chrome67-ff57/Dockerfile +++ b/browsers/chrome67-ff57/Dockerfile @@ -12,7 +12,10 @@ 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.list && \ apt-get update && \ - apt-get install -y dbus-x11 google-chrome-stable && \ + apt-get install --no-install-recommends -y \ + dbus-x11 \ + google-chrome-stable \ + zip && \ rm -rf /var/lib/apt/lists/* # "fake" dbus address to prevent errors @@ -25,9 +28,6 @@ RUN wget --no-verbose -O /tmp/firefox.tar.bz2 https://download-installer.cdn.moz && rm /tmp/firefox.tar.bz2 \ && ln -fs /opt/firefox/firefox /usr/bin/firefox -# Add zip utility - it comes in very handy -RUN apt-get update && apt-get install -y zip - # versions of local tools RUN node -v RUN npm -v diff --git a/browsers/chrome67/Dockerfile b/browsers/chrome67/Dockerfile index 6a438d54da..8250cab401 100644 --- a/browsers/chrome67/Dockerfile +++ b/browsers/chrome67/Dockerfile @@ -10,16 +10,16 @@ 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.list && \ apt-get update && \ - apt-get install -y dbus-x11 google-chrome-stable && \ + apt-get install --no-install-recommends -y \ + dbus-x11 \ + google-chrome-stable \ + zip && \ rm -rf /var/lib/apt/lists/* # "fake" dbus address to prevent errors # https://github.com/SeleniumHQ/docker-selenium/issues/87 ENV DBUS_SESSION_BUS_ADDRESS=/dev/null -# Add zip utility - it comes in very handy -RUN apt-get update && apt-get install -y zip - # versions of local tools RUN node -v RUN npm -v diff --git a/browsers/chrome69/Dockerfile b/browsers/chrome69/Dockerfile index 9d173a30aa..cee55fcb9e 100644 --- a/browsers/chrome69/Dockerfile +++ b/browsers/chrome69/Dockerfile @@ -10,16 +10,16 @@ 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.list && \ apt-get update && \ - apt-get install -y dbus-x11 google-chrome-stable && \ + apt-get install --no-install-recommends -y \ + dbus-x11 \ + google-chrome-stable \ + zip && \ rm -rf /var/lib/apt/lists/* # "fake" dbus address to prevent errors # https://github.com/SeleniumHQ/docker-selenium/issues/87 ENV DBUS_SESSION_BUS_ADDRESS=/dev/null -# Add zip utility - it comes in very handy -RUN apt-get update && apt-get install -y zip - # versions of local tools RUN node -v RUN npm -v