diff --git a/osx/Dockerfile b/osx/Dockerfile index 43a93a6f84..3db43c8468 100644 --- a/osx/Dockerfile +++ b/osx/Dockerfile @@ -41,11 +41,13 @@ RUN chmod +x /docker-compose ENV BOOT2DOCKER_ISO_VERSION $DOCKER_VERSION RUN curl -fsSL -o /boot2docker.iso https://github.com/tianon/boot2docker-legacy/releases/download/v1.8.0-rc2/boot2docker.iso -ENV KITEMATIC_VERSION 0.8.0-rc3 +ENV KITEMATIC_VERSION 0.8.0-rc4 RUN curl -fsSL -o /kitematic.zip https://github.com/kitematic/kitematic/releases/download/v$KITEMATIC_VERSION/Kitematic-$KITEMATIC_VERSION-Mac.zip # ENV INSTALLER_VERSION $DOCKER_VERSION -ENV INSTALLER_VERSION 1.8.0-rc4 +ENV INSTALLER_VERSION 1.8.0-rc5 + +ENV MIXPANEL_TOKEN c306ae65c33d7d09fe3e546f36493a6e # Start building package @@ -123,6 +125,10 @@ RUN cd /mpkg/dockercompose.pkg && \ # boot2dockeriso.pkg RUN cd /mpkg/boot2dockeriso.pkg && \ + export EVENT_DATA=$(echo "{\"event\":\"Installer Finished\",\"properties\":{\"token\":\"$MIXPANEL_TOKEN\",\"version\":\"$INSTALLER_VERSION\",\"os\":\"darwin\"}}" | base64 | tr -d '\n') && \ + sed -i \ + -e "s/%EVENT_DATA%/$EVENT_DATA/g" \ + ./Scripts/postinstall && \ cd Scripts && find . | cpio -o --format odc | gzip -c > ../Scripts.bin && cd .. && \ rm -r Scripts && mv Scripts.bin Scripts && \ mkdir ./rootfs && \ @@ -178,8 +184,9 @@ RUN sed -i \ RUN sed -i \ -e "s/%INSTALLER_VERSION%/$INSTALLER_VERSION/g" \ mpkg/Resources/en.lproj/Installed.html -RUN sed -i \ - -e "s/%INSTALLER_VERSION%/$INSTALLER_VERSION/g" \ +RUN export EVENT_DATA=$(echo "{\"event\":\"Installer Started\",\"properties\":{\"token\":\"$MIXPANEL_TOKEN\",\"version\":\"$INSTALLER_VERSION\",\"os\":\"darwin\"}}" | base64 | tr -d '\n') && \ + sed -i \ + -e "s/%EVENT_DATA%/$EVENT_DATA/g" \ /mpkg/Distribution && \ sed -i \ -e "s/%VBOX_VERSION%/$VBOX_VERSION/g" \ diff --git a/osx/mpkg/Distribution b/osx/mpkg/Distribution index 755852b31e..826f5bde70 100644 --- a/osx/mpkg/Distribution +++ b/osx/mpkg/Distribution @@ -10,10 +10,10 @@ - + @@ -24,9 +24,6 @@ - - - @@ -45,10 +42,6 @@ - #boot2dockeriso.pkg - - - #dockerquickstartterminalapp.pkg @@ -62,9 +55,14 @@ #VBoxKEXTs.pkg @@ -153,4 +152,11 @@ + + + + #boot2dockeriso.pkg + + + diff --git a/osx/mpkg/boot2dockeriso.pkg/Scripts/postinstall b/osx/mpkg/boot2dockeriso.pkg/Scripts/postinstall index c782e29f20..fdffd4f2dd 100755 --- a/osx/mpkg/boot2dockeriso.pkg/Scripts/postinstall +++ b/osx/mpkg/boot2dockeriso.pkg/Scripts/postinstall @@ -1,5 +1,10 @@ -#!/bin/sh +#!/bin/bash +# Place boot2docker ISO in cache mkdir -p ~/.docker/machine/cache cp /usr/local/share/boot2docker/boot2docker.iso ~/.docker/machine/cache/boot2docker.iso chown -R $USER:staff ~/.docker + +curl -H "Content-Type: application/json" -X POST "https://api.mixpanel.com/track/?data=%EVENT_DATA%" + +# TODO: run migration