Skip to content

Maint/upgrade ubuntu and node #201

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 9, 2016
Merged

Maint/upgrade ubuntu and node #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
78aea5b
Upgrade to Ubuntu LTS version 16.04 (Xenial).
kayabendroth Apr 9, 2016
de17c29
Add repo for security updates.
kayabendroth Apr 9, 2016
38f785b
Upgrade Node.js to LTS version 4.4.2.
kayabendroth Apr 9, 2016
f39f2a3
Upgrade npm modules 'chai' and 'wd'.
kayabendroth Apr 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
FROM ubuntu:15.10
FROM ubuntu:16.04
MAINTAINER Selenium <[email protected]>

#================================================
# Customize sources for apt-get
#================================================
RUN echo "deb http://archive.ubuntu.com/ubuntu wily main universe\n" > /etc/apt/sources.list \
&& echo "deb http://archive.ubuntu.com/ubuntu wily-updates main universe\n" >> /etc/apt/sources.list
RUN echo "deb http://archive.ubuntu.com/ubuntu xenial main universe\n" > /etc/apt/sources.list \
&& echo "deb http://archive.ubuntu.com/ubuntu xenial-updates main universe\n" >> /etc/apt/sources.list \
&& echo "deb http://security.ubuntu.com/ubuntu xenial-security main universe\n" >> /etc/apt/sources.list

#========================
# Miscellaneous packages
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,10 @@ $ docker run -d -p 4444:4444 -e SE_OPTS=-debug --name selenium-hub selenium/hub:

## Building the images

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.
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.

``` bash
$ docker pull ubuntu:15.04
$ docker pull ubuntu:16.04
```

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

### Troubleshooting
Expand Down
2 changes: 1 addition & 1 deletion Test/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:4.1.1-onbuild
FROM node:4.4.2-onbuild
MAINTAINER Selenium <[email protected]>

ENV TEST_CMD ""
Expand Down
4 changes: 2 additions & 2 deletions Test/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
},
"license": "Apache 2",
"dependencies": {
"chai": "^3.2.0",
"chai": "^3.5.0",
"colors": "^1.1.2",
"wd": "^0.3.12"
"wd": "^0.4.0"
}
}