docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Code Activity

Merge branch 'rc'

Browse Source
This commit is contained in:
Jean-Laurent de Morlhon
2016-02-02 18:30:55 -08:00
parent 3db74c8162 f6dc25a3b2
commit 327af3a052
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Dockerfile.osx
View File

@@ -26,23 +26,25 @@ RUN curl -fsSL -o /vbox.dmg http://download.virtualbox.org/virtualbox/$VBOX_VERS
# Download the Docker parts
ENV INSTALLER_VERSION 1.9.1j
ENV DOCKER_VERSION 1.9.1
# RUN curl -fsSL -o /docker https://test.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION
RUN curl -fsSL -o docker https://get.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION
ENV INSTALLER_VERSION 1.10.0-rc3
ENV DOCKER_VERSION 1.10.0-rc3
RUN curl -fsSL -o /docker https://test.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION
# RUN curl -fsSL -o docker https://get.docker.com/builds/Darwin/x86_64/docker-$DOCKER_VERSION
RUN chmod +x /docker
ENV DOCKER_MACHINE_VERSION 0.5.6
ENV DOCKER_MACHINE_VERSION 0.6.0-rc3
RUN curl -fsSL -o /docker-machine https://github.com/docker/machine/releases/download/v$DOCKER_MACHINE_VERSION/docker-machine_Darwin-x86_64
RUN chmod +x /docker-machine
ENV DOCKER_COMPOSE_VERSION 1.5.2
ENV DOCKER_COMPOSE_VERSION 1.6.0-rc2
RUN curl -fsSL -o /docker-compose https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-Darwin-x86_64
RUN chmod +x /docker-compose
ENV BOOT2DOCKER_ISO_VERSION $DOCKER_VERSION
RUN curl -fsSL -o /boot2docker.iso https://github.com/boot2docker/boot2docker/releases/download/v$DOCKER_VERSION/boot2docker.iso
# RUN curl -fsSL -o /boot2docker.iso https://github.com/tianon/boot2docker-legacy/releases/download/v$DOCKER_VERSION/boot2docker.iso
ENV KITEMATIC_VERSION 0.9.6
RUN curl -fsSL -o /kitematic.zip https://github.com/kitematic/kitematic/releases/download/v$KITEMATIC_VERSION/Kitematic-$KITEMATIC_VERSION-Mac.zip

13
Dockerfile.windows
View File

@@ -17,10 +17,10 @@ RUN cd innosetup && \
wine "./innounp.exe" -e "is-unicode.exe"
# installer components
ENV INSTALLER_VERSION 1.9.1j
ENV DOCKER_VERSION 1.9.1
ENV DOCKER_MACHINE_VERSION 0.5.6
ENV DOCKER_COMPOSE_VERSION 1.5.2
ENV INSTALLER_VERSION 1.10.0-rc3
ENV DOCKER_VERSION 1.10.0-rc3
ENV DOCKER_MACHINE_VERSION 0.6.0-rc3
ENV DOCKER_COMPOSE_VERSION 1.6.0-rc2
ENV BOOT2DOCKER_ISO_VERSION $DOCKER_VERSION
ENV KITEMATIC_VERSION 0.9.6
ENV VIRTUALBOX_VERSION 5.0.14
@@ -30,15 +30,14 @@ ENV MIXPANEL_TOKEN c306ae65c33d7d09fe3e546f36493a6e
RUN mkdir /bundle
WORKDIR /bundle
RUN curl -fsSL -o docker.exe "https://get.docker.com/builds/Windows/x86_64/docker-$DOCKER_VERSION.exe"
# RUN curl -fsSL -o docker.exe "https://test.docker.com/builds/Windows/x86_64/docker-$DOCKER_VERSION.exe"
# RUN curl -fsSL -o docker.exe "https://get.docker.com/builds/Windows/x86_64/docker-$DOCKER_VERSION.exe"
RUN curl -fsSL -o docker.exe "https://test.docker.com/builds/Windows/x86_64/docker-$DOCKER_VERSION.exe"
RUN curl -fsSL -o docker-machine.exe "https://github.com/docker/machine/releases/download/v$DOCKER_MACHINE_VERSION/docker-machine_Windows-x86_64.exe"
RUN curl -fsSL -o docker-compose.exe "https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_VERSION/docker-compose-Windows-x86_64.exe"
RUN curl -fsSL -o boot2docker.iso https://github.com/boot2docker/boot2docker/releases/download/v$BOOT2DOCKER_ISO_VERSION/boot2docker.iso
# RUN curl -fsSL -o boot2docker.iso https://github.com/tianon/boot2docker-legacy/releases/download/v$BOOT2DOCKER_ISO_VERSION/boot2docker.iso
RUN curl -fsSL -o kitematic.zip "https://github.com/kitematic/kitematic/releases/download/v$KITEMATIC_VERSION/Kitematic-$KITEMATIC_VERSION-Windows.zip" && \
mkdir kitematic && \