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

Commit 62d2fa0

Browse files
elgaluelgalu
committed
Switch from apt-get to just apt
1 parent 033130c commit 62d2fa0

File tree

1 file changed

+66
-66
lines changed

1 file changed

+66
-66
lines changed

‎Dockerfile‎

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ RUN set -ex \
107107
# has `ts` that will prepend a timestamp to every line of input you give it
108108
# Layer size: medium: 29.8 MB
109109
# Layer size: medium: 27.9 MB (with --no-install-recommends)
110-
RUN apt-get -qqy update \
111-
&& apt-get -qqy install \
110+
RUN apt -qqy update \
111+
&& apt -qqy install \
112112
libltdl7 \
113113
libhavege1 \
114114
netcat-openbsd \
@@ -126,9 +126,9 @@ RUN apt-get -qqy update \
126126
dbus-x11 \
127127
wget \
128128
curl \
129-
&& apt-get -qyy autoremove \
129+
&& apt -qyy autoremove \
130130
&& rm -rf /var/lib/apt/lists/* \
131-
&& apt-get -qyy clean
131+
&& apt -qyy clean
132132

133133
#==============================
134134
# Locale and encoding settings
@@ -142,16 +142,16 @@ ENV LANGUAGE ${LANG_WHICH}_${LANG_WHERE}.${ENCODING}
142142
ENV LANG ${LANGUAGE}
143143
# Layer size: small: ~9 MB
144144
# Layer size: small: ~9 MB MB (with --no-install-recommends)
145-
RUN apt-get -qqy update \
146-
&& apt-get -qqy --no-install-recommends install \
145+
RUN apt -qqy update \
146+
&& apt -qqy --no-install-recommends install \
147147
language-pack-en \
148148
tzdata \
149149
locales \
150150
&& locale-gen ${LANGUAGE} \
151151
&& dpkg-reconfigure --frontend noninteractive locales \
152-
&& apt-get -qyy autoremove \
152+
&& apt -qyy autoremove \
153153
&& rm -rf /var/lib/apt/lists/* \
154-
&& apt-get -qyy clean
154+
&& apt -qyy clean
155155

156156
#===================
157157
# Timezone settings
@@ -193,16 +193,16 @@ RUN useradd seluser \
193193
# https://github.com/SeleniumHQ/docker-selenium/issues/14#issuecomment-67414070
194194
# Layer size: big: 132.2 MB
195195
# Layer size: big: 132.2 MB (with --no-install-recommends)
196-
RUN apt-get -qqy update \
197-
&& apt-get -qqy install \
196+
RUN apt -qqy update \
197+
&& apt -qqy install \
198198
openjdk-8-jre-headless \
199199
&& sed -i 's/securerandom.source=file:\/dev\/urandom/securerandom.source=file:\/dev\/.\/urandom/g' \
200200
/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/security/java.security \
201201
&& sed -i 's/securerandom.source=file:\/dev\/random/securerandom.source=file:\/dev\/.\/urandom/g' \
202202
/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/security/java.security \
203-
&& apt-get -qyy autoremove \
203+
&& apt -qyy autoremove \
204204
&& rm -rf /var/lib/apt/lists/* \
205-
&& apt-get -qyy clean
205+
&& apt -qyy clean
206206

207207
#==================
208208
# Java8 - Oracle
@@ -212,42 +212,42 @@ RUN apt-get -qqy update \
212212
# https://github.com/SeleniumHQ/docker-selenium/issues/14#issuecomment-67414070
213213
# Layer size: huge: 618.6 MB (with --no-install-recommends)
214214
# Layer size: huge: 661.1 MB
215-
# RUN apt-get -qqy update \
216-
# && apt-get -qqy --no-install-recommends install \
215+
# RUN apt -qqy update \
216+
# && apt -qqy --no-install-recommends install \
217217
# software-properties-common \
218218
# && echo debconf shared/accepted-oracle-license-v1-1 \
219219
# select true | debconf-set-selections \
220220
# && echo debconf shared/accepted-oracle-license-v1-1 \
221221
# seen true | debconf-set-selections \
222222
# && add-apt-repository ppa:webupd8team/java \
223-
# && apt-get -qqy update \
224-
# && apt-get -qqy install \
223+
# && apt -qqy update \
224+
# && apt -qqy install \
225225
# oracle-java8-installer \
226226
# && sed -i 's/securerandom.source=file:\/dev\/urandom/securerandom.source=file:\/dev\/.\/urandom/g' \
227227
# /usr/lib/jvm/java-8-oracle/jre/lib/security/java.security \
228228
# && sed -i 's/securerandom.source=file:\/dev\/random/securerandom.source=file:\/dev\/.\/urandom/g' \
229229
# /usr/lib/jvm/java-8-oracle/jre/lib/security/java.security \
230-
# && apt-get -qqy install \
230+
# && apt -qqy install \
231231
# oracle-java8-set-default \
232-
# && apt-get -qyy autoremove \
232+
# && apt -qyy autoremove \
233233
# && rm -rf /var/lib/apt/lists/* \
234-
# && apt-get -qyy clean
234+
# && apt -qyy clean
235235

236236
#==============================================
237237
# Java blocks until kernel have enough entropy
238238
# to generate the /dev/random seed
239239
#==============================================
240240
# See: SeleniumHQ/docker-selenium/issues/14
241241
# Layer size: tiny: 0.8 MB
242-
RUN apt-get -qqy update \
242+
RUN apt -qqy update \
243243
&& apt-key update -qqy \
244-
&& apt-get -qqy install \
244+
&& apt -qqy install \
245245
haveged rng-tools \
246246
&& service haveged start \
247247
&& update-rc.d haveged defaults \
248-
&& apt-get -qyy autoremove \
248+
&& apt -qyy autoremove \
249249
&& rm -rf /var/lib/apt/lists/* \
250-
&& apt-get -qyy clean
250+
&& apt -qyy clean
251251

252252
#===================================================
253253
# Run the following commands as non-privileged user
@@ -285,8 +285,8 @@ USER root
285285
#=========================================================
286286
# Layer size: big.: 79.39 MB (with --no-install-recommends)
287287
# Layer size: huge: 296 MB
288-
# RUN apt-get -qqy update \
289-
# && apt-get -qqy --no-install-recommends install \
288+
# RUN apt -qqy update \
289+
# && apt -qqy --no-install-recommends install \
290290
# python2.7 \
291291
# python-pip \
292292
# python-openssl \
@@ -295,7 +295,7 @@ USER root
295295
# && pip install --upgrade pip \
296296
# && pip install --upgrade setuptools \
297297
# && rm -rf /var/lib/apt/lists/* \
298-
# && apt-get -qyy clean
298+
# && apt -qyy clean
299299

300300
#=========================================================
301301
# Python3 for Supervisor, selenium tests, and other stuff
@@ -308,8 +308,8 @@ USER root
308308
# Layer size: big.: 138.9 MB (with --no-install-recommends)
309309
# Layer size: huge: 309.9 MB
310310
COPY test/requirements.txt /test/
311-
RUN apt-get -qqy update \
312-
&& apt-get -qqy --no-install-recommends install \
311+
RUN apt -qqy update \
312+
&& apt -qqy --no-install-recommends install \
313313
python3 \
314314
python3-pip \
315315
python3-dev \
@@ -320,7 +320,7 @@ RUN apt-get -qqy update \
320320
&& pip3 install --upgrade numpy \
321321
&& pip3 install --requirement /test/requirements.txt \
322322
&& rm -rf /var/lib/apt/lists/* \
323-
&& apt-get -qyy clean
323+
&& apt -qyy clean
324324
RUN cd /usr/local/bin \
325325
&& { [ -e easy_install ] || ln -s easy_install-* easy_install; } \
326326
&& ln -s idle3 idle \
@@ -338,8 +338,8 @@ RUN cd /usr/local/bin \
338338
# Check every now and then if version 4 is finally the stable one
339339
# https://pypi.python.org/pypi/supervisor
340340
# https://github.com/Supervisor/supervisor
341-
# RUN apt-get -qqy update \
342-
# && apt-get -qqy install \
341+
# RUN apt -qqy update \
342+
# && apt -qqy install \
343343
# supervisor \
344344
# 2017-10-21 commit: 3f04badc3237f0, supervisor/version.txt: 4.0.0.dev0
345345
# 2017-05-30 commit: 946d9cf3be4db3, supervisor/version.txt: 4.0.0.dev0
@@ -350,7 +350,7 @@ RUN SHA="3f04badc3237f0d86fa88208455d8560c20bc2e7" \
350350
&& pip install --upgrade \
351351
"https://github.com/Supervisor/supervisor/zipball/${SHA}" \
352352
&& rm -rf /var/lib/apt/lists/* \
353-
&& apt-get -qyy clean
353+
&& apt -qyy clean
354354

355355
#================
356356
# Font libraries
@@ -371,8 +371,8 @@ RUN SHA="3f04badc3237f0d86fa88208455d8560c20bc2e7" \
371371
# https://github.com/SeleniumHQ/docker-selenium/issues/383#issuecomment-278367069
372372
# Layer size: small: 36.28 MB (with --no-install-recommends)
373373
# Layer size: small: 36.28 MB
374-
RUN apt-get -qqy update \
375-
&& apt-get -qqy --no-install-recommends install \
374+
RUN apt -qqy update \
375+
&& apt -qqy --no-install-recommends install \
376376
libfontconfig \
377377
libfreetype6 \
378378
xfonts-cyrillic \
@@ -382,7 +382,7 @@ RUN apt-get -qqy update \
382382
fonts-wqy-zenhei \
383383
ttf-ubuntu-font-family \
384384
&& rm -rf /var/lib/apt/lists/* \
385-
&& apt-get -qyy clean
385+
&& apt -qyy clean
386386

387387
#=========
388388
# Openbox
@@ -391,11 +391,11 @@ RUN apt-get -qqy update \
391391
# Let's disable this as is only filling disk space
392392
# Layer size: huge: 153.4 MB (with --no-install-recommends)
393393
# Layer size: huge: 224.4 MB
394-
# RUN apt-get -qqy update \
395-
# && apt-get -qqy --no-install-recommends install \
394+
# RUN apt -qqy update \
395+
# && apt -qqy --no-install-recommends install \
396396
# openbox obconf menu \
397397
# && rm -rf /var/lib/apt/lists/* \
398-
# && apt-get -qyy clean
398+
# && apt -qyy clean
399399

400400
#=========
401401
# fluxbox
@@ -404,12 +404,12 @@ RUN apt-get -qqy update \
404404
# xfce4-notifyd adds 5mb but allows `notify-send` notifications
405405
# Layer size: small: 9.659 MB
406406
# Layer size: small: 6.592 MB (with --no-install-recommends)
407-
RUN apt-get -qqy update \
408-
&& apt-get -qqy install \
407+
RUN apt -qqy update \
408+
&& apt -qqy install \
409409
fluxbox \
410410
xfce4-notifyd \
411411
&& rm -rf /var/lib/apt/lists/* \
412-
&& apt-get -qyy clean
412+
&& apt -qyy clean
413413

414414
#============================
415415
# Xvfb X virtual framebuffer
@@ -423,23 +423,23 @@ RUN apt-get -qqy update \
423423
# xserver-xorg-video-dummy 116.7 MB no-recommends: 90.52 MB
424424
# Layer size: big: 136.9 MB (with --no-install-recommends)
425425
# Layer size: big: 162.6 MB
426-
RUN apt-get -qqy update \
427-
&& apt-get -qqy --no-install-recommends install \
426+
RUN apt -qqy update \
427+
&& apt -qqy --no-install-recommends install \
428428
xvfb \
429429
xorg \
430430
&& rm -rf /var/lib/apt/lists/* \
431-
&& apt-get -qyy clean
431+
&& apt -qyy clean
432432

433433
#============
434434
# VNC Server
435435
#============
436436
# Layer size: medium: 12.67 MB
437437
# Layer size: medium: 10.08 MB (with --no-install-recommends)
438-
RUN apt-get -qqy update \
439-
&& apt-get -qqy install \
438+
RUN apt -qqy update \
439+
&& apt -qqy install \
440440
x11vnc \
441441
&& rm -rf /var/lib/apt/lists/* \
442-
&& apt-get -qyy clean
442+
&& apt -qyy clean
443443

444444
#===================================================
445445
# Run the following commands as non-privileged user
@@ -482,11 +482,11 @@ USER root
482482
# https://www.youtube.com/html5
483483
# Layer size: big: 149.9 MB
484484
# Layer size: big: 135.4 MB (with --no-install-recommends)
485-
RUN apt-get -qqy update \
486-
&& apt-get -qqy --no-install-recommends install \
485+
RUN apt -qqy update \
486+
&& apt -qqy --no-install-recommends install \
487487
gstreamer1.0-libav \
488488
&& rm -rf /var/lib/apt/lists/* \
489-
&& apt-get -qyy clean
489+
&& apt -qyy clean
490490

491491
#=================================================
492492
# ffmpeg/libav/avconv video codecs & dependencies
@@ -496,14 +496,14 @@ RUN apt-get -qqy update \
496496
# libavformat-dev libavcodec-dev libavutil-dev libqt4-dev make g++ libz-dev
497497
# Layer size: medium: ~12 MB (with --no-install-recommends)
498498
# Layer size: medium: ~21 MB
499-
# RUN apt-get -qqy update \
500-
# && apt-get -qqy --no-install-recommends install \
499+
# RUN apt -qqy update \
500+
# && apt -qqy --no-install-recommends install \
501501
# libx264-dev \
502502
# libvorbis-dev \
503503
# libx11-dev \
504504
# gpac \
505505
# && rm -rf /var/lib/apt/lists/* \
506-
# && apt-get -qyy clean
506+
# && apt -qyy clean
507507

508508
#========
509509
# ffmpeg
@@ -513,12 +513,12 @@ RUN apt-get -qqy update \
513513
# (use in Ubuntu >= 15) packages: ffmpeg
514514
# Layer size: medium: ~12 MB (with --no-install-recommends)
515515
# Layer size: medium: ~17 MB
516-
RUN apt-get -qqy update \
517-
&& apt-get -qqy install \
516+
RUN apt -qqy update \
517+
&& apt -qqy install \
518518
ffmpeg \
519519
gpac \
520520
&& rm -rf /var/lib/apt/lists/* \
521-
&& apt-get -qyy clean
521+
&& apt -qyy clean
522522

523523
#==============
524524
# libav/avconv
@@ -528,11 +528,11 @@ RUN apt-get -qqy update \
528528
# libav-tools (avconv): a fork of ffmpeg
529529
# a better alternative to Pyvnc2swf
530530
# (use in Ubuntu <= 14) packages: libav-tools libx264-142
531-
RUN apt-get -qqy update \
532-
&& apt-get -qqy --no-install-recommends install \
531+
RUN apt -qqy update \
532+
&& apt -qqy --no-install-recommends install \
533533
libav-tools \
534534
&& rm -rf /var/lib/apt/lists/* \
535-
&& apt-get -qyy clean
535+
&& apt -qyy clean
536536

537537
# ------------------------#
538538
# Sauce Connect Tunneling #
@@ -554,11 +554,11 @@ RUN apt-get -qqy update \
554554
# libasound2 \
555555
# libpulse-dev \
556556
# xul-ext-ubufox \
557-
RUN apt-get -qqy update \
558-
&& apt-get -qqy --no-install-recommends install \
557+
RUN apt -qqy update \
558+
&& apt -qqy --no-install-recommends install \
559559
`apt-cache depends firefox | awk '/Depends:/{print$2}'` \
560560
&& rm -rf /var/lib/apt/lists/* \
561-
&& apt-get -qyy clean
561+
&& apt -qyy clean
562562

563563
#===================================================
564564
# Run the following commands as non-privileged user
@@ -640,17 +640,17 @@ ENV CHROME_URL="https://dl.google.com/linux/direct" \
640640
LABEL selenium_chrome_version "${EXPECTED_CHROME_VERSION}"
641641

642642
# Layer size: huge: 196.3 MB
643-
RUN apt-get -qqy update \
643+
RUN apt -qqy update \
644644
&& mkdir -p chrome-deb \
645645
&& wget -nv "${CHROME_URL}/google-chrome-stable_current_amd64.deb" \
646646
-O "./chrome-deb/google-chrome-stable_current_amd64.deb" \
647-
&& apt-get -qyy --no-install-recommends install \
647+
&& apt -qyy --no-install-recommends install \
648648
"${CHROME_BASE_DEB_PATH}-stable_current_amd64.deb" \
649649
&& rm "${CHROME_BASE_DEB_PATH}-stable_current_amd64.deb" \
650650
&& rm -rf ./chrome-deb \
651-
&& apt-get -qyy autoremove \
651+
&& apt -qyy autoremove \
652652
&& rm -rf /var/lib/apt/lists/* \
653-
&& apt-get -qyy clean \
653+
&& apt -qyy clean \
654654
&& export CH_STABLE_VER=$(/usr/bin/google-chrome-stable --version | grep -iEo "${GREP_ONLY_NUMS_VER}") \
655655
&& echo "CH_STABLE_VER:'${CH_STABLE_VER}' vs EXPECTED_CHROME_VERSION:'${EXPECTED_CHROME_VERSION}'" \
656656
&& [ "${CH_STABLE_VER}" = "${EXPECTED_CHROME_VERSION}" ] || fail

0 commit comments

Comments
 (0)