Fix startup and winpty errors

Signed-off-by: Jeffrey Morgan <[email protected]>

Dockerfile.osx

@@ -26,7 +26,7 @@ RUN curl -fsSL -o /vbox.dmg http://download.virtualbox.org/virtualbox/$VBOX_VERS
 
 # Download the Docker parts
 
-ENV INSTALLER_VERSION 1.9.0b
+ENV INSTALLER_VERSION 1.9.0c
 ENV DOCKER_VERSION 1.9.0
 # 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

Dockerfile.windows

@@ -17,7 +17,7 @@ RUN cd innosetup && \
     wine "./innounp.exe" -e "is-unicode.exe"
 
 # installer components
-ENV INSTALLER_VERSION 1.9.0b
+ENV INSTALLER_VERSION 1.9.0c
 ENV DOCKER_VERSION 1.9.0
 ENV DOCKER_MACHINE_VERSION 0.5.0
 ENV DOCKER_COMPOSE_VERSION 1.5.0

osx/mpkg/quickstart.app/Contents/Resources/Scripts/start.sh

@@ -34,6 +34,7 @@ VM_STATUS=$($DOCKER_MACHINE status $VM)
 if [ "$VM_STATUS" != "Running" ]; then
   echo "Starting machine $VM..."
   $DOCKER_MACHINE start $VM
+  yes | $DOCKER_MACHINE regenerate-certs $VM
 fi
 
 echo "Setting environment variables for machine $VM..."

windows/Toolbox.iss

@@ -78,8 +78,8 @@ Source: "{#virtualBoxMsi}"; DestDir: "{app}\installers\virtualbox"; DestName: "v
 [Icons]
 Name: "{userprograms}\Docker\Kitematic (Alpha)"; WorkingDir: "{app}"; Filename: "{app}\kitematic\Kitematic.exe"; Components: "Kitematic"
 Name: "{commondesktop}\Kitematic (Alpha)"; WorkingDir: "{app}"; Filename: "{app}\kitematic\Kitematic.exe"; Tasks: desktopicon; Components: "Kitematic"
-Name: "{userprograms}\Docker\Docker Quickstart Terminal"; WorkingDir: "{app}"; Filename: "{pf64}\Git\git-bash.exe"; Parameters: """{app}\start.sh"""; IconFilename: "{app}/docker-quickstart-terminal.ico"; Components: "Docker"
-Name: "{commondesktop}\Docker Quickstart Terminal"; WorkingDir: "{app}"; Filename: "{pf64}\Git\git-bash.exe"; Parameters: """{app}\start.sh"""; IconFilename: "{app}/docker-quickstart-terminal.ico"; Tasks: desktopicon; Components: "Docker"
+Name: "{userprograms}\Docker\Docker Quickstart Terminal"; WorkingDir: "{app}"; Filename: "{pf64}\Git\bin\bash.exe"; Parameters: "--login -i ""{app}\start.sh"""; IconFilename: "{app}/docker-quickstart-terminal.ico"; Components: "Docker"
+Name: "{commondesktop}\Docker Quickstart Terminal"; WorkingDir: "{app}"; Filename: "{pf64}\Git\bin\bash.exe"; Parameters: "--login -i ""{app}\start.sh"""; IconFilename: "{app}/docker-quickstart-terminal.ico"; Tasks: desktopicon; Components: "Docker"
 
 [UninstallRun]
 Filename: "{app}\delete.sh"

windows/start.sh

@@ -38,6 +38,7 @@ VM_STATUS=$($DOCKER_MACHINE status $VM)
 if [ "$VM_STATUS" != "Running" ]; then
   echo "Starting machine $VM..."
   $DOCKER_MACHINE start $VM
+  yes | $DOCKER_MACHINE regenerate-certs $VM
 fi
 
 echo "Setting environment variables for machine $VM..."
@@ -59,7 +60,6 @@ cat << EOF
 EOF
 echo -e "${BLUE}docker${NC} is configured to use the ${GREEN}$VM${NC} machine with IP ${GREEN}$($DOCKER_MACHINE ip $VM)${NC}"
 echo "For help getting started, check out the docs at https://docs.docker.com"
-echo "NOTE: When using interactive commands, prepend winpty. Examples: 'winpty docker run -it ...', 'winpty docker exec -it ...'."
 echo
 cd