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

Fix version name ENV

Browse Source 
Fix version name ENV
This commit is contained in:
Michael Chiang
2015-07-13 17:45:33 -07:00
parent 2137536624
commit be5f0dee61
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -1,4 +1,4 @@
DockerToolbox.pkg
DockerToolbox*.pkg
windows/Output/**
windows/bundle/**
site/public

14
osx/Dockerfile
View File

@@ -80,8 +80,6 @@ RUN cd /mpkg/docker.pkg && \
-e "s/%DOCKER_NUMBER_OF_FILES%/`find . | wc -l`/g" \
-e "s/%DOCKER_INSTALL_KBYTES%/`du -sk | cut -f1`/g" \
-e "s/%DOCKER_VERSION%/$DOCKER_VERSION/g" \
-e "s/%DOCKER_MACHINE_VERSION%/$DOCKER_MACHINE_VERSION/g" \
-e "s/%DOCKER_COMPOSE_VERSION%/$DOCKER_COMPOSE_VERSION/g" \
../PackageInfo /mpkg/Distribution && \
cd .. && \
rm -rf ./rootfs
@@ -98,7 +96,7 @@ RUN cd /mpkg/dockermachine.pkg && \
sed -i \
-e "s/%DOCKERMACHINE_NUMBER_OF_FILES%/`find . | wc -l`/g" \
-e "s/%DOCKERMACHINE_INSTALL_KBYTES%/`du -sk | cut -f1`/g" \
-e "s/%DOCKERMACHINE_VERSION%/$DOCKER_VERSION/g" \
-e "s/%DOCKERMACHINE_VERSION%/$DOCKER_MACHINE_VERSION/g" \
../PackageInfo /mpkg/Distribution && \
cd .. && \
rm -rf ./rootfs
@@ -115,7 +113,7 @@ RUN cd /mpkg/dockercompose.pkg && \
sed -i \
-e "s/%DOCKERCOMPOSE_NUMBER_OF_FILES%/`find . | wc -l`/g" \
-e "s/%DOCKERCOMPOSE_INSTALL_KBYTES%/`du -sk | cut -f1`/g" \
-e "s/%DOCKERCOMPOSE_VERSION%/$DOCKER_VERSION/g" \
-e "s/%DOCKERCOMPOSE_VERSION%/$DOCKER_COMPOSE_VERSION/g" \
../PackageInfo /mpkg/Distribution && \
cd .. && \
rm -rf ./rootfs
@@ -161,7 +159,7 @@ RUN cd /mpkg/kitematicapp.pkg && \
sed -i \
-e "s/%KITEMATICAPP_NUMBER_OF_FILES%/`find . | wc -l`/g" \
-e "s/%KITEMATICAPP_INSTALL_KBYTES%/`du -sk | cut -f1`/g" \
-e "s/%KITEMATICAPP_VERSION%/$INSTALLER_VERSION/g" \
-e "s/%KITEMATICAPP_VERSION%/$KITEMATIC_VERSION/g" \
../PackageInfo /mpkg/Distribution && \
cd .. && \
rm -rf ./rootfs
@@ -180,6 +178,12 @@ RUN sed -i \
/mpkg/Distribution && \
sed -i \
-e "s/%VBOX_VERSION%/$VBOX_VERSION/g" \
-e "s/%DOCKER_VERSION%/$DOCKER_VERSION/g" \
-e "s/%DOCKERMACHINE_VERSION%/$DOCKER_MACHINE_VERSION/g" \
-e "s/%DOCKERCOMPOSE_VERSION%/$DOCKER_COMPOSE_VERSION/g" \
-e "s/%BOOT2DOCKER_ISO_VERSION%/$BOOT2DOCKER_ISO_VERSION/g" \
-e "s/%DOCKERCLIAPP_VERSION%/$INSTALLER_VERSION/g" \
-e "s/%KITEMATICAPP_VERSION%/$KITEMATIC_VERSION/g" \
mpkg/Resources/en.lproj/Localizable.strings
# Make DMG rootfs

11
osx/mpkg/Resources/en.lproj/Localizable.strings
View File

@@ -1,21 +1,21 @@
'docker_title' = 'Docker Toolbox';
'choiceDockerCLI_title' = 'Docker';
'choiceDockerCLI_title' = 'Docker Client %DOCKER_VERSION%';
'choiceDockerCLI_msg' = 'Installs the Docker client for Mac OS X into /usr/local/bin/';
'choiceDockerMachineCLI_title' = 'Docker Machine';
'choiceDockerMachineCLI_title' = 'Docker Machine %DOCKERMACHINE_VERSION%';
'choiceDockerMachineCLI_msg' = 'Installs the Docker Machine binary into /usr/local/bin/';
'choiceDockerComposeCLI_title' = 'Docker Compose';
'choiceDockerComposeCLI_title' = 'Docker Compose %DOCKERCOMPOSE_VERSION%';
'choiceDockerComposeCLI_msg' = 'Installs the Docker Compose binary into /usr/local/bin/';
'choiceBoot2DockerISO_title' = 'Boot2Docker ISO';
'choiceBoot2DockerISO_title' = 'Boot2Docker ISO %BOOT2DOCKER_ISO_VERSION%';
'choiceBoot2DockerISO_msg' = 'Installs the boot2docker.iso into /usr/local/share/';
'choiceDockerCLIAPP_title' = 'Docker CLI Quick-start applet';
'choiceDockerCLIAPP_msg' = 'Installs the Docker CLI Quick-start applet into /Applications/';
'choiceKitematicAPP_title' = 'Kitematic';
'choiceKitematicAPP_title' = 'Kitematic %KITEMATICAPP_VERSION%';
'choiceKitematicAPP_msg' = 'Installs Kitematic into /Applications/';
'choiceVBox_title' = 'Oracle VM VirtualBox %VBOX_VERSION%';
@@ -29,4 +29,3 @@
'UNSUPPORTED_OS_TLE' = "Unsupported OS version detected!";
'UNSUPPORTED_OS_MSG' = "The installer has detected an unsupported operation system. VirtualBox requires Mac OS X 10.6 or later.";