Skip to content

Commit 2194148

Browse files
ZainabSalamehZainabSalameh
authored
Merge branch 'master' into patch-1
2 parents e7b117d + c326394 commit 2194148

File tree

18 files changed

+92
-64
lines changed

18 files changed

+92
-64
lines changed

‎.github/ISSUE_TEMPLATE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Image(s):
33
<!-- node-chrome? hub? standalone-firefox? -->
44
Docker-Selenium Image Version(s):
5-
<!-- 3, 3.4, 3.11.0-californium etc -->
5+
<!-- 3, 3.4, 3.12.0-americium etc -->
66
Docker Version:
77
<!-- 17.09.0-ce, 17.06.2-ce etc -->
88
OS:

‎Base/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,5 @@ USER seluser
5656
#==========
5757
RUN sudo mkdir -p /opt/selenium \
5858
&& sudo chown seluser:seluser /opt/selenium \
59-
&& wget --no-verbose https://selenium-release.storage.googleapis.com/3.11/selenium-server-standalone-3.11.0.jar \
59+
&& wget --no-verbose https://selenium-release.storage.googleapis.com/3.12/selenium-server-standalone-3.12.0.jar \
6060
-O /opt/selenium/selenium-server-standalone.jar

‎Hub/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/base:3.11.0-californium
5+
FROM selenium/base:3.12.0-americium
66
LABEL authors=SeleniumHQ
77

88
USER seluser

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
NAME := selenium
2-
VERSION := $(or $(VERSION),$(VERSION),3.11.0-californium)
2+
VERSION := $(or $(VERSION),$(VERSION),3.12.0-americium)
33
NAMESPACE := $(or $(NAMESPACE),$(NAMESPACE),$(NAME))
44
AUTHORS := $(or $(AUTHORS),$(AUTHORS),SeleniumHQ)
55
PLATFORM := $(shell uname -s)

‎NodeBase/Dockerfile‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/base:3.11.0-californium
5+
FROM selenium/base:3.12.0-americium
66
LABEL authors=SeleniumHQ
77

88
USER root
@@ -25,16 +25,16 @@ ENV LANGUAGE ${LANG_WHICH}_${LANG_WHERE}.${ENCODING}
2525
ENV LANG ${LANGUAGE}
2626
# Layer size: small: ~9 MB
2727
# Layer size: small: ~9 MB MB (with --no-install-recommends)
28-
RUN apt -qqy update \
29-
&& apt -qqy --no-install-recommends install \
28+
RUN apt-get -qqy update \
29+
&& apt-get -qqy --no-install-recommends install \
3030
language-pack-en \
3131
tzdata \
3232
locales \
3333
&& locale-gen ${LANGUAGE} \
3434
&& dpkg-reconfigure --frontend noninteractive locales \
35-
&& apt -qyy autoremove \
35+
&& apt-get -qyy autoremove \
3636
&& rm -rf /var/lib/apt/lists/* \
37-
&& apt -qyy clean
37+
&& apt-get -qyy clean
3838

3939
#================
4040
# Font libraries
@@ -56,8 +56,8 @@ RUN apt -qqy update \
5656
# https://github.com/SeleniumHQ/docker-selenium/issues/383#issuecomment-278367069
5757
# Layer size: small: 36.28 MB (with --no-install-recommends)
5858
# Layer size: small: 36.28 MB
59-
RUN apt -qqy update \
60-
&& apt -qqy --no-install-recommends install \
59+
RUN apt-get -qqy update \
60+
&& apt-get -qqy --no-install-recommends install \
6161
libfontconfig \
6262
libfreetype6 \
6363
xfonts-cyrillic \
@@ -68,7 +68,7 @@ RUN apt -qqy update \
6868
fonts-tlwg-loma-otf \
6969
ttf-ubuntu-font-family \
7070
&& rm -rf /var/lib/apt/lists/* \
71-
&& apt -qyy clean
71+
&& apt-get -qyy clean
7272

7373
#===================================================
7474
# Run the following commands as non-privileged user

‎NodeBase/Dockerfile.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ ENV LANGUAGE ${LANG_WHICH}_${LANG_WHERE}.${ENCODING}
1818
ENV LANG ${LANGUAGE}
1919
# Layer size: small: ~9 MB
2020
# Layer size: small: ~9 MB MB (with --no-install-recommends)
21-
RUN apt -qqy update \
22-
&& apt -qqy --no-install-recommends install \
21+
RUN apt-get -qqy update \
22+
&& apt-get -qqy --no-install-recommends install \
2323
language-pack-en \
2424
tzdata \
2525
locales \
2626
&& locale-gen ${LANGUAGE} \
2727
&& dpkg-reconfigure --frontend noninteractive locales \
28-
&& apt -qyy autoremove \
28+
&& apt-get -qyy autoremove \
2929
&& rm -rf /var/lib/apt/lists/* \
30-
&& apt -qyy clean
30+
&& apt-get -qyy clean
3131

3232
#================
3333
# Font libraries
@@ -49,8 +49,8 @@ RUN apt -qqy update \
4949
# https://github.com/SeleniumHQ/docker-selenium/issues/383#issuecomment-278367069
5050
# Layer size: small: 36.28 MB (with --no-install-recommends)
5151
# Layer size: small: 36.28 MB
52-
RUN apt -qqy update \
53-
&& apt -qqy --no-install-recommends install \
52+
RUN apt-get -qqy update \
53+
&& apt-get -qqy --no-install-recommends install \
5454
libfontconfig \
5555
libfreetype6 \
5656
xfonts-cyrillic \
@@ -61,7 +61,7 @@ RUN apt -qqy update \
6161
fonts-tlwg-loma-otf \
6262
ttf-ubuntu-font-family \
6363
&& rm -rf /var/lib/apt/lists/* \
64-
&& apt -qyy clean
64+
&& apt-get -qyy clean
6565

6666
#===================================================
6767
# Run the following commands as non-privileged user

‎NodeChrome/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/node-base:3.11.0-californium
5+
FROM selenium/node-base:3.12.0-americium
66
LABEL authors=SeleniumHQ
77

88
USER root

‎NodeChromeDebug/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED.
33
# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE
44
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
5-
FROM selenium/node-chrome:3.11.0-californium
5+
FROM selenium/node-chrome:3.12.0-americium
66
LABEL authors=SeleniumHQ
77

88
USER root

‎NodeChromeDebug/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ If you are running Boot2Docker on Mac then you already have a [VNC client](http:
3737
When you are prompted for the password it is __secret__. If you wish to change this then you should either change it in the `/NodeBase/Dockerfile` and build the images yourself, or you can define a docker image that derives from the posted ones which reconfigures it:
3838

3939
``` dockerfile
40-
FROM selenium/node-chrome-debug:3.11.0-californium
40+
FROM selenium/node-chrome-debug:3.12.0-americium
4141

4242
RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
4343
```

‎NodeDebug/README.template.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ If you are running Boot2Docker on Mac then you already have a [VNC client](http:
3737
When you are prompted for the password it is __secret__. If you wish to change this then you should either change it in the `/NodeBase/Dockerfile` and build the images yourself, or you can define a docker image that derives from the posted ones which reconfigures it:
3838

3939
``` dockerfile
40-
FROM selenium/##BASE##-debug:3.11.0-californium
40+
FROM selenium/##BASE##-debug:3.12.0-americium
4141

4242
RUN x11vnc -storepasswd <your-password-here> /home/seluser/.vnc/passwd
4343
```

0 commit comments

Comments
 (0)