diff --git a/.dockerignore b/.dockerignore index 651665bb..45418e07 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,2 +1,5 @@ node_modules +public/css +public/build +public/js .git diff --git a/Dockerfile b/Dockerfile index 3e47b992..18b32821 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,6 +14,10 @@ ENV DB_DRIVER=mysql \ COPY . /var/www/html/ WORKDIR /var/www/html/ +RUN curl http://nodejs.org/dist/v0.10.35/node-v0.10.35-linux-x64.tar.gz -o /tmp/nodejs.tar.gz && \ + tar xzf /tmp/nodejs.tar.gz -C /tmp && export PATH=/tmp/node-v0.10.35-linux-x64/bin:$PATH && \ + npm install && node_modules/.bin/bower install --allow-root && node_modules/.bin/gulp && \ + rm -rf /tmp/* node_modules/ # ensure the assets have been compiled RUN for d in public/{build,css,js} ; do test ! -d public/build && \ echo "Run 'gulp' before building container" >&2 && exit 1 || : ; done diff --git a/README.md b/README.md index 766a962a..64d94c7e 100644 --- a/README.md +++ b/README.md @@ -52,13 +52,13 @@ docker run --name mysql -e MYSQL_USER=$DB_USERNAME -e MYSQL_PASSWORD=$DB_PASSWOR Initialize the DB if you havent yet: ``` -docker run --link mysql:mysql -e DB_HOST=mysql -e DB_DATABASE=$DB_DATABASE -e DB_USERNAME=$DB_USERNAME -e DB_PASSWORD=$DB_PASSWORD byxorna/cachet:test php artisan migrate +docker run --link mysql:mysql -e DB_HOST=mysql -e DB_DATABASE=$DB_DATABASE -e DB_USERNAME=$DB_USERNAME -e DB_PASSWORD=$DB_PASSWORD cachethq/cachet:latest php artisan migrate ``` Run Cachet: ``` -docker run -d --link mysql:mysql -p 80:80 -e DB_HOST=mysql -e DB_DATABASE=$DB_DATABASE -e DB_USERNAME=$DB_USERNAME -e DB_PASSWORD=$DB_PASSWORD byxorna/cachet:test +docker run -d --name cachet --link mysql:mysql -p 80:80 -e DB_HOST=mysql -e DB_DATABASE=$DB_DATABASE -e DB_USERNAME=$DB_USERNAME -e DB_PASSWORD=$DB_PASSWORD cachethq/cachet:latest ``` Now go to ```http:///setup``` and have fun!