Skip to content

Commit 6890cdb

Browse files
committed
Merge pull request #5 from GetMagicVision/docker-update
Bump docker to 1.9.0
2 parents abb4c05 + 4ad0790 commit 6890cdb

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

Dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ MAINTAINER MagicVision Team
44

55
ENV NVM_VERSION v0.29.0
66
ENV NODEJS_VERSION v5.0.0
7+
ENV DOCKER_VERSION 1.9.0
78

89
RUN apt-get update -y
910

@@ -30,12 +31,9 @@ ADD gitlab-CA.crt /usr/local/share/ca-certificates/
3031
RUN update-ca-certificates
3132

3233
# Install docker-cli
33-
# See https://github.com/docker-library/docker/blob/bb15fc25bbd4f51a880cf02f91eab447b1083b75/1.8/Dockerfile
34+
# See https://github.com/docker/docker/releases
3435
ENV DOCKER_BUCKET get.docker.com
35-
ENV DOCKER_VERSION 1.8.2
36-
ENV DOCKER_SHA256 97a3f5924b0b831a310efa8bf0a4c91956cd6387c4a8667d27e2b2dd3da67e4d
3736
RUN curl -fSL "https://${DOCKER_BUCKET}/builds/Linux/x86_64/docker-$DOCKER_VERSION" -o /usr/local/bin/docker && \
38-
echo "${DOCKER_SHA256} /usr/local/bin/docker" | sha256sum -c - && \
3937
chmod +x /usr/local/bin/docker
4038

4139
# Install ruby and sass

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
## Features
1010

11-
- Docker support with [docker:dind][]
11+
- Docker 1.9.0 support with [docker:dind][]
1212
- nvm 0.29.0
1313
- node.js 5.0.0 with npm 3.3.6
1414
- Ruby 1.9.1 with gem 1.8.23
@@ -27,7 +27,7 @@
2727
## Getting Started
2828

2929
```bash
30-
docker run --privileged --name docker-host -d docker:1.8-dind
30+
docker run --privileged --name docker-host -d docker:1.9-dind
3131
docker run -it --link docker-host:docker magicvision/nodejs-dev /bin/bash
3232
```
3333

0 commit comments

Comments
 (0)