rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-19 07:19:05 +00:00
Code Issues Releases Wiki Activity

Merge pull request #622 from imikushin/docker-1.9

Browse Source 
docker-1.9
This commit is contained in:
Ivan Mikushin 2015-11-13 10:30:16 +05:00
commit ec13f32aaa
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile.build-base
View File

@ -8,7 +8,7 @@ RUN locale-gen en_US.UTF-8
ENV LANG en_US.UTF-8
ENV LC_ALL en_US.UTF-8
ENV TERM xterm
RUN curl -sL https://get.docker.com/builds/Linux/x86_64/docker-1.8.2 > /usr/bin/docker
RUN curl -sL https://get.docker.com/builds/Linux/x86_64/docker-1.8.3 > /usr/bin/docker
RUN chmod +x /usr/bin/docker
RUN pip install tox

4
build.conf
View File

@ -1,6 +1,6 @@
IMAGE_NAME=rancher/os
VERSION=v0.4.1-dev
DOCKER_BINARY_URL=https://github.com/rancher/docker/releases/download/v1.8.3-ros2/docker-1.8.3
DOCKER_BINARY_URL=https://github.com/rancher/docker/releases/download/v1.9.0-ros1/docker-1.9.0
COMPILED_KERNEL_URL=https://github.com/rancher/os-kernel/releases/download/Ubuntu-4.2.0-16.19/linux-4.2.3-rancher-x86.tar.gz
DFS_IMAGE=rancher/docker:1.8.3
DFS_IMAGE=rancher/docker:1.9.0-1