Skip to content
This repository was archived by the owner on Jun 30, 2021. It is now read-only.

Commit 02c4745

Browse files
committed
Use apt-get clean for RHEL 7.3 credits @tnguyen14
1 parent a914500 commit 02c4745

File tree

2 files changed

+39
-18
lines changed

2 files changed

+39
-18
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ Note image ids also change after scm-source.json has being updated which trigger
1010
## TBD_DOCKER_TAG
1111
+ **Changes:** https://github.com/elgalu/docker-selenium/compare/TBD_PREV_COMM...master (TBD_DATE)
1212
+ Support Japanese/Chinese fonts #153 credits @katryo
13+
+ Chore: Rename requirements-sele-3.txt to requirements.txt
14+
+ Chore: Use `apt-get clean` for RHEL 7.3 credits @tnguyen14
1315
+ **Image tag details:**
1416
+ Selenium version: TBD_SELENIUM_3_VERSION (TBD_SELENIUM_3_REVISION)
1517
+ Chrome stable: TBD_CHROME_STABLE

Dockerfile

Lines changed: 37 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ RUN apt-get -qqy update \
102102
wget \
103103
curl \
104104
&& apt-get -qyy autoremove \
105-
&& rm -rf /var/lib/apt/lists/*
105+
&& rm -rf /var/lib/apt/lists/* \
106+
&& apt-get -qyy clean
106107

107108
#==============================
108109
# Locale and encoding settings
@@ -124,7 +125,8 @@ RUN apt-get -qqy update \
124125
&& locale-gen ${LANGUAGE} \
125126
&& dpkg-reconfigure --frontend noninteractive locales \
126127
&& apt-get -qyy autoremove \
127-
&& rm -rf /var/lib/apt/lists/*
128+
&& rm -rf /var/lib/apt/lists/* \
129+
&& apt-get -qyy clean
128130

129131
#===================
130132
# Timezone settings
@@ -168,7 +170,8 @@ RUN apt-get -qqy update \
168170
&& sed -i 's/securerandom.source=file:\/dev\/random/securerandom.source=file:\/dev\/.\/urandom/g' \
169171
/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/security/java.security \
170172
&& apt-get -qyy autoremove \
171-
&& rm -rf /var/lib/apt/lists/*
173+
&& rm -rf /var/lib/apt/lists/* \
174+
&& apt-get -qyy clean
172175

173176
#==================
174177
# Java8 - Oracle
@@ -196,7 +199,8 @@ RUN apt-get -qqy update \
196199
# && apt-get -qqy install \
197200
# oracle-java8-set-default \
198201
# && apt-get -qyy autoremove \
199-
# && rm -rf /var/lib/apt/lists/*
202+
# && rm -rf /var/lib/apt/lists/* \
203+
# && apt-get -qyy clean
200204

201205
#==============================================
202206
# Java blocks until kernel have enough entropy
@@ -211,7 +215,8 @@ RUN apt-get -qqy update \
211215
&& service haveged start \
212216
&& update-rc.d haveged defaults \
213217
&& apt-get -qyy autoremove \
214-
&& rm -rf /var/lib/apt/lists/*
218+
&& rm -rf /var/lib/apt/lists/* \
219+
&& apt-get -qyy clean
215220

216221
#===================================================
217222
# Run the following commands as non-privileged user
@@ -267,7 +272,8 @@ RUN apt-get -qqy update \
267272
libffi-dev \
268273
&& pip install --upgrade pip \
269274
&& pip install --upgrade setuptools \
270-
&& rm -rf /var/lib/apt/lists/*
275+
&& rm -rf /var/lib/apt/lists/* \
276+
&& apt-get -qyy clean
271277

272278
#=========================================================
273279
# Python3 for Supervisor, selenium tests, and other stuff
@@ -288,7 +294,8 @@ RUN apt-get -qqy update \
288294
# libssl-dev libffi-dev \
289295
# && pip3 install --upgrade pip \
290296
# && pip3 install --upgrade setuptools \
291-
# && rm -rf /var/lib/apt/lists/*
297+
# && rm -rf /var/lib/apt/lists/* \
298+
# && apt-get -qyy clean
292299
# RUN cd /usr/local/bin \
293300
# && { [ -e easy_install ] || ln -s easy_install-* easy_install; } \
294301
# && ln -s idle3 idle \
@@ -316,7 +323,8 @@ ENV RUN_DIR="/var/run/sele"
316323
RUN SHA="23925d017f8eccafb1be57c509a07df75490c83d" \
317324
&& pip install --upgrade \
318325
"https://github.com/Supervisor/supervisor/zipball/${SHA}" \
319-
&& rm -rf /var/lib/apt/lists/*
326+
&& rm -rf /var/lib/apt/lists/* \
327+
&& apt-get -qyy clean
320328

321329
#================
322330
# Font libraries
@@ -347,7 +355,8 @@ RUN apt-get -qqy update \
347355
fonts-ipafont-gothic \
348356
fonts-wqy-zenhei \
349357
ttf-ubuntu-font-family \
350-
&& rm -rf /var/lib/apt/lists/*
358+
&& rm -rf /var/lib/apt/lists/* \
359+
&& apt-get -qyy clean
351360

352361
#=========
353362
# Openbox
@@ -359,7 +368,8 @@ RUN apt-get -qqy update \
359368
# RUN apt-get -qqy update \
360369
# && apt-get -qqy --no-install-recommends install \
361370
# openbox obconf menu \
362-
# && rm -rf /var/lib/apt/lists/*
371+
# && rm -rf /var/lib/apt/lists/* \
372+
# && apt-get -qyy clean
363373

364374
#=========
365375
# fluxbox
@@ -370,7 +380,8 @@ RUN apt-get -qqy update \
370380
RUN apt-get -qqy update \
371381
&& apt-get -qqy install \
372382
fluxbox \
373-
&& rm -rf /var/lib/apt/lists/*
383+
&& rm -rf /var/lib/apt/lists/* \
384+
&& apt-get -qyy clean
374385

375386
#============================
376387
# Xvfb X virtual framebuffer
@@ -388,7 +399,8 @@ RUN apt-get -qqy update \
388399
&& apt-get -qqy --no-install-recommends install \
389400
xvfb \
390401
xorg \
391-
&& rm -rf /var/lib/apt/lists/*
402+
&& rm -rf /var/lib/apt/lists/* \
403+
&& apt-get -qyy clean
392404

393405
#============
394406
# VNC Server
@@ -398,7 +410,8 @@ RUN apt-get -qqy update \
398410
RUN apt-get -qqy update \
399411
&& apt-get -qqy install \
400412
x11vnc \
401-
&& rm -rf /var/lib/apt/lists/*
413+
&& rm -rf /var/lib/apt/lists/* \
414+
&& apt-get -qyy clean
402415

403416
#===================================================
404417
# Run the following commands as non-privileged user
@@ -444,7 +457,8 @@ USER root
444457
RUN apt-get -qqy update \
445458
&& apt-get -qqy --no-install-recommends install \
446459
gstreamer1.0-libav \
447-
&& rm -rf /var/lib/apt/lists/*
460+
&& rm -rf /var/lib/apt/lists/* \
461+
&& apt-get -qyy clean
448462

449463
#=================================================
450464
# ffmpeg/libav/avconv video codecs & dependencies
@@ -460,7 +474,8 @@ RUN apt-get -qqy update \
460474
# libvorbis-dev \
461475
# libx11-dev \
462476
# gpac \
463-
# && rm -rf /var/lib/apt/lists/*
477+
# && rm -rf /var/lib/apt/lists/* \
478+
# && apt-get -qyy clean
464479

465480
#========
466481
# ffmpeg
@@ -474,7 +489,8 @@ RUN apt-get -qqy update \
474489
&& apt-get -qqy install \
475490
ffmpeg \
476491
gpac \
477-
&& rm -rf /var/lib/apt/lists/*
492+
&& rm -rf /var/lib/apt/lists/* \
493+
&& apt-get -qyy clean
478494

479495
#==============
480496
# libav/avconv
@@ -487,7 +503,8 @@ RUN apt-get -qqy update \
487503
RUN apt-get -qqy update \
488504
&& apt-get -qqy --no-install-recommends install \
489505
libav-tools \
490-
&& rm -rf /var/lib/apt/lists/*
506+
&& rm -rf /var/lib/apt/lists/* \
507+
&& apt-get -qyy clean
491508

492509
# ------------------------#
493510
# Sauce Connect Tunneling #
@@ -512,7 +529,8 @@ RUN apt-get -qqy update \
512529
RUN apt-get -qqy update \
513530
&& apt-get -qqy --no-install-recommends install \
514531
`apt-cache depends firefox | awk '/Depends:/{print$2}'` \
515-
&& rm -rf /var/lib/apt/lists/*
532+
&& rm -rf /var/lib/apt/lists/* \
533+
&& apt-get -qyy clean
516534

517535
#===================================================
518536
# Run the following commands as non-privileged user
@@ -612,6 +630,7 @@ RUN apt-get -qqy update \
612630
&& rm -rf ./chrome-deb \
613631
&& apt-get -qyy autoremove \
614632
&& rm -rf /var/lib/apt/lists/* \
633+
&& apt-get -qyy clean \
615634
&& export CH_STABLE_VER=$(/usr/bin/google-chrome-stable --version | grep -iEo "${GREP_ONLY_NUMS_VER}") \
616635
&& echo "${CH_STABLE_VER}"
617636
# We have a wrapper for /opt/google/chrome/google-chrome

0 commit comments

Comments
 (0)