Skip to content

Commit 7ce5dbe

Browse files
committed
Merge pull request SeleniumHQ#201 from kayabendroth/maint/upgrade-ubuntu-and-node
Maint/upgrade ubuntu and node
2 parents 365a983 + f39f2a3 commit 7ce5dbe

File tree

4 files changed

+10
-9
lines changed

4 files changed

+10
-9
lines changed

Base/Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
FROM ubuntu:15.10
1+
FROM ubuntu:16.04
22
MAINTAINER Selenium <[email protected]>
33

44
#================================================
55
# Customize sources for apt-get
66
#================================================
7-
RUN echo "deb http://archive.ubuntu.com/ubuntu wily main universe\n" > /etc/apt/sources.list \
8-
&& echo "deb http://archive.ubuntu.com/ubuntu wily-updates main universe\n" >> /etc/apt/sources.list
7+
RUN echo "deb http://archive.ubuntu.com/ubuntu xenial main universe\n" > /etc/apt/sources.list \
8+
&& echo "deb http://archive.ubuntu.com/ubuntu xenial-updates main universe\n" >> /etc/apt/sources.list \
9+
&& echo "deb http://security.ubuntu.com/ubuntu xenial-security main universe\n" >> /etc/apt/sources.list
910

1011
#========================
1112
# Miscellaneous packages

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ $ docker run -d -p 4444:4444 -e SE_OPTS=-debug --name selenium-hub selenium/hub:
7474

7575
## Building the images
7676

77-
Ensure you have the `ubuntu:15.04` base image downloaded, this step is _optional_ since Docker takes care of downloading the parent base image automatically.
77+
Ensure you have the `ubuntu:16.04` base image downloaded, this step is _optional_ since Docker takes care of downloading the parent base image automatically.
7878

7979
``` bash
80-
$ docker pull ubuntu:15.04
80+
$ docker pull ubuntu:16.04
8181
```
8282

8383
Clone the repo and from the project directory root you can build everything by running:
@@ -181,7 +181,7 @@ selenium/node-chrome 2.53.0 9dd73160660b 30 minut
181181
selenium/node-base 2.53.0 1b7a0b7024b1 32 minutes ago 426.1 MB
182182
selenium/hub 2.53.0 2570bbb98229 33 minutes ago 394.4 MB
183183
selenium/base 2.53.0 33478d455dab 33 minutes ago 362.6 MB
184-
ubuntu 15.04 013f3d01d247 6 days ago 131.4 MB
184+
ubuntu 16.04 0b7735b9290f 6 days ago 123.7 MB
185185
```
186186

187187
### Troubleshooting

Test/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:4.1.1-onbuild
1+
FROM node:4.4.2-onbuild
22
MAINTAINER Selenium <[email protected]>
33

44
ENV TEST_CMD ""

Test/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
},
99
"license": "Apache 2",
1010
"dependencies": {
11-
"chai": "^3.2.0",
11+
"chai": "^3.5.0",
1212
"colors": "^1.1.2",
13-
"wd": "^0.3.12"
13+
"wd": "^0.4.0"
1414
}
1515
}

0 commit comments

Comments
 (0)