Skip to content

Commit 15d9dc0

Browse files
ddavisonddavison
authored
Merge pull request #300 from F2X/master
Change FIREFOX_VERSION from ENV to ARG + apt cache clean
2 parents 861f50b + 5798f25 commit 15d9dc0

File tree

9 files changed

+26
-26
lines changed

9 files changed

+26
-26
lines changed

‎Base/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ RUN apt-get update -qqy \
2020
sudo \
2121
unzip \
2222
wget \
23-
&& rm -rf /var/lib/apt/lists/* \
23+
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/* \
2424
&& sed -i 's/securerandom\.source=file:\/dev\/random/securerandom\.source=file:\/dev\/urandom/' ./usr/lib/jvm/java-8-openjdk-amd64/jre/lib/security/java.security
2525

2626
#==========

‎NodeBase/Dockerfile.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ RUN echo "${TZ}" > /etc/timezone \
1717
RUN apt-get update -qqy \
1818
&& apt-get -qqy install \
1919
xvfb \
20-
&& rm -rf /var/lib/apt/lists/*
20+
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
2121

2222
#==============================
2323
# Scripts to run Selenium Node

‎NodeChrome/Dockerfile.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key
1919
&& apt-get -qqy install \
2020
${CHROME_VERSION:-google-chrome-stable} \
2121
&& rm /etc/apt/sources.list.d/google-chrome.list \
22-
&& rm -rf /var/lib/apt/lists/*
22+
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
2323

2424
#==================
2525
# Chrome webdriver

‎NodeChromeDebug/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ USER root
1313
RUN apt-get update -qqy \
1414
&& apt-get -qqy install \
1515
x11vnc \
16-
&& rm -rf /var/lib/apt/lists/* \
16+
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/* \
1717
&& mkdir -p /root/.vnc \
1818
&& x11vnc -storepasswd secret ~/.vnc/passwd
1919

@@ -27,7 +27,7 @@ RUN locale-gen en_US.UTF-8 \
2727
&& apt-get update -qqy \
2828
&& apt-get -qqy --no-install-recommends install \
2929
language-pack-en \
30-
&& rm -rf /var/lib/apt/lists/*
30+
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
3131

3232
#=======
3333
# Fonts
@@ -39,7 +39,7 @@ RUN apt-get update -qqy \
3939
xfonts-75dpi \
4040
xfonts-cyrillic \
4141
xfonts-scalable \
42-
&& rm -rf /var/lib/apt/lists/*
42+
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
4343

4444
#=========
4545
# fluxbox
@@ -48,7 +48,7 @@ RUN apt-get update -qqy \
4848
RUN apt-get update -qqy \
4949
&& apt-get -qqy install \
5050
fluxbox \
51-
&& rm -rf /var/lib/apt/lists/*
51+
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
5252

5353
#==============================
5454
# Scripts to run Selenium Node

‎NodeDebug/Dockerfile.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ USER root
88
RUN apt-get update -qqy \
99
&& apt-get -qqy install \
1010
x11vnc \
11-
&& rm -rf /var/lib/apt/lists/* \
11+
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/* \
1212
&& mkdir -p /root/.vnc \
1313
&& x11vnc -storepasswd secret ~/.vnc/passwd
1414

@@ -22,7 +22,7 @@ RUN locale-gen en_US.UTF-8 \
2222
&& apt-get update -qqy \
2323
&& apt-get -qqy --no-install-recommends install \
2424
language-pack-en \
25-
&& rm -rf /var/lib/apt/lists/*
25+
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
2626

2727
#=======
2828
# Fonts
@@ -34,7 +34,7 @@ RUN apt-get update -qqy \
3434
xfonts-75dpi \
3535
xfonts-cyrillic \
3636
xfonts-scalable \
37-
&& rm -rf /var/lib/apt/lists/*
37+
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
3838

3939
#=========
4040
# fluxbox
@@ -43,7 +43,7 @@ RUN apt-get update -qqy \
4343
RUN apt-get update -qqy \
4444
&& apt-get -qqy install \
4545
fluxbox \
46-
&& rm -rf /var/lib/apt/lists/*
46+
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
4747

4848
#==============================
4949
# Scripts to run Selenium Node

‎NodeFirefox/Dockerfile.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ USER root
55
#=========
66
# Firefox
77
#=========
8-
ENV FIREFOX_VERSION 47.0.1
8+
ARG FIREFOX_VERSION=47.0.1
99
RUN apt-get update -qqy \
1010
&& apt-get -qqy --no-install-recommends install firefox \
11-
&& rm -rf /var/lib/apt/lists/* \
11+
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/* \
1212
&& wget --no-verbose -O /tmp/firefox.tar.bz2 https://download-installer.cdn.mozilla.net/pub/firefox/releases/$FIREFOX_VERSION/linux-x86_64/en-US/firefox-$FIREFOX_VERSION.tar.bz2 \
1313
&& apt-get -y purge firefox \
1414
&& rm -rf /opt/firefox \
@@ -20,7 +20,7 @@ RUN apt-get update -qqy \
2020
#============
2121
# GeckoDriver
2222
#============
23-
ENV GECKODRIVER_VERSION 0.10.0
23+
ARG GECKODRIVER_VERSION=0.10.0
2424
RUN wget --no-verbose -O /tmp/geckodriver.tar.gz https://github.com/mozilla/geckodriver/releases/download/v$GECKODRIVER_VERSION/geckodriver-v$GECKODRIVER_VERSION-linux64.tar.gz \
2525
&& rm -rf /opt/geckodriver \
2626
&& tar -C /opt -zxf /tmp/geckodriver.tar.gz \

‎NodeFirefoxDebug/Dockerfile.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ USER root
99
RUN apt-get update -qqy \
1010
&& apt-get -qqy install \
1111
x11vnc \
12-
&& rm -rf /var/lib/apt/lists/* \
12+
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/* \
1313
&& mkdir -p /root/.vnc \
1414
&& x11vnc -storepasswd secret ~/.vnc/passwd
1515

@@ -23,7 +23,7 @@ RUN locale-gen en_US.UTF-8 \
2323
&& apt-get update -qqy \
2424
&& apt-get -qqy --no-install-recommends install \
2525
language-pack-en \
26-
&& rm -rf /var/lib/apt/lists/*
26+
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
2727

2828
#=======
2929
# Fonts
@@ -35,7 +35,7 @@ RUN apt-get update -qqy \
3535
xfonts-75dpi \
3636
xfonts-cyrillic \
3737
xfonts-scalable \
38-
&& rm -rf /var/lib/apt/lists/*
38+
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
3939

4040
#=========
4141
# fluxbox
@@ -44,7 +44,7 @@ RUN apt-get update -qqy \
4444
RUN apt-get update -qqy \
4545
&& apt-get -qqy install \
4646
fluxbox \
47-
&& rm -rf /var/lib/apt/lists/*
47+
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
4848

4949
#==============================
5050
# Scripts to run Selenium Node

‎StandaloneChromeDebug/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ USER root
1313
RUN apt-get update -qqy \
1414
&& apt-get -qqy install \
1515
x11vnc \
16-
&& rm -rf /var/lib/apt/lists/* \
16+
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/* \
1717
&& mkdir -p /root/.vnc \
1818
&& x11vnc -storepasswd secret ~/.vnc/passwd
1919

@@ -27,7 +27,7 @@ RUN locale-gen en_US.UTF-8 \
2727
&& apt-get update -qqy \
2828
&& apt-get -qqy --no-install-recommends install \
2929
language-pack-en \
30-
&& rm -rf /var/lib/apt/lists/*
30+
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
3131

3232
#=======
3333
# Fonts
@@ -39,7 +39,7 @@ RUN apt-get update -qqy \
3939
xfonts-75dpi \
4040
xfonts-cyrillic \
4141
xfonts-scalable \
42-
&& rm -rf /var/lib/apt/lists/*
42+
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
4343

4444
#=========
4545
# fluxbox
@@ -48,7 +48,7 @@ RUN apt-get update -qqy \
4848
RUN apt-get update -qqy \
4949
&& apt-get -qqy install \
5050
fluxbox \
51-
&& rm -rf /var/lib/apt/lists/*
51+
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
5252

5353
#==============================
5454
# Scripts to run Selenium Node

‎StandaloneFirefoxDebug/Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ USER root
1313
RUN apt-get update -qqy \
1414
&& apt-get -qqy install \
1515
x11vnc \
16-
&& rm -rf /var/lib/apt/lists/* \
16+
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/* \
1717
&& mkdir -p /root/.vnc \
1818
&& x11vnc -storepasswd secret ~/.vnc/passwd
1919

@@ -27,7 +27,7 @@ RUN locale-gen en_US.UTF-8 \
2727
&& apt-get update -qqy \
2828
&& apt-get -qqy --no-install-recommends install \
2929
language-pack-en \
30-
&& rm -rf /var/lib/apt/lists/*
30+
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
3131

3232
#=======
3333
# Fonts
@@ -39,7 +39,7 @@ RUN apt-get update -qqy \
3939
xfonts-75dpi \
4040
xfonts-cyrillic \
4141
xfonts-scalable \
42-
&& rm -rf /var/lib/apt/lists/*
42+
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
4343

4444
#=========
4545
# fluxbox
@@ -48,7 +48,7 @@ RUN apt-get update -qqy \
4848
RUN apt-get update -qqy \
4949
&& apt-get -qqy install \
5050
fluxbox \
51-
&& rm -rf /var/lib/apt/lists/*
51+
&& rm -rf /var/lib/apt/lists/* /var/cache/apt/*
5252

5353
#==============================
5454
# Scripts to run Selenium Node

0 commit comments

Comments
 (0)