From c9a549b6fe2417cca7aa43a5d93e0d85f726ae35 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sat, 15 Aug 2015 05:19:29 +0700 Subject: [PATCH 1/6] no really dockershit this time --- Dockerfile | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..8350319 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,18 @@ +FROM debian:jessie + +MAINTAINER "Diego Marangoni" + +RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0x5a16e7281be7a449 +RUN echo deb http://dl.hhvm.com/debian jessie main | tee /etc/apt/sources.list.d/hhvm.list +RUN curl -sL https://deb.nodesource.com/setup_iojs_3.x | bash - + +RUN apt-get clean && \ + apt-get update && \ + apt-get install -y sqlite hhvm build-essential git iojs bower && \ + rm -rf /var/lib/apt/lists/* + +RUN git clone https://github.com/fruux/sabre-katana /etc/hhvm +WORKDIR /etc/hhvm +RUN make + +CMD ["hhvm", "-a"] From 0eda8844fd7da85e5434482daed489c335aca639 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sat, 15 Aug 2015 05:37:37 +0700 Subject: [PATCH 2/6] no really makefileshit this time --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8897906..68bf75a 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ install-server: composer install --no-dev install-client: - bower install --production + bower install --production --allow-root npm install --no-optional devinstall: devinstall-server devinstall-client build-client From 6db5a94c88ad67eda961ae7b6c40846416ebfaf4 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sat, 15 Aug 2015 05:54:23 +0700 Subject: [PATCH 3/6] Update Dockerfile It's a hackjob.... --- Dockerfile | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8350319..5aa8019 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,16 +2,25 @@ FROM debian:jessie MAINTAINER "Diego Marangoni" +RUN apt-get update +RUN apt-get install -y curl RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0x5a16e7281be7a449 RUN echo deb http://dl.hhvm.com/debian jessie main | tee /etc/apt/sources.list.d/hhvm.list RUN curl -sL https://deb.nodesource.com/setup_iojs_3.x | bash - - +RUN echo '{ "allow_root": true }' > /root/.bowerrc RUN apt-get clean && \ apt-get update && \ - apt-get install -y sqlite hhvm build-essential git iojs bower && \ + apt-get install -y sqlite hhvm build-essential git iojs && \ rm -rf /var/lib/apt/lists/* +RUN npm install -g bower +RUN rm -rf /etc/hhvm RUN git clone https://github.com/fruux/sabre-katana /etc/hhvm +RUN curl -sS https://getcomposer.org/installer | hhvm --php -dHttp.SlowQueryThreshold=30000 +RUN mv composer.phar /usr/local/bin/composer +ENV alias composer="hhvm -v ResourceLimit.SocketDefaultTimeout=30 -v Http.SlowQueryThreshold=30000 -v Eval.Jit=false /usr/local/bin/composer" + + WORKDIR /etc/hhvm RUN make From 17cd1fea7a10c12388689cb1c7a3f97749180731 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sat, 15 Aug 2015 06:05:48 +0700 Subject: [PATCH 4/6] Update Dockerfile yet more... evil commands.... --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5aa8019..d4f21d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,4 +24,4 @@ ENV alias composer="hhvm -v ResourceLimit.SocketDefaultTimeout=30 -v Http.SlowQu WORKDIR /etc/hhvm RUN make -CMD ["hhvm", "-a"] +CMD ["hhvm", "-v Http.SlowQueryThreshold=30000", "-v Eval.Jit=false", "-v ResourceLimit.SocketDefaultTimeout=30"] From 084cdd274c0aeac5875e4824c1302ad1035e332b Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Sat, 15 Aug 2015 06:05:59 +0700 Subject: [PATCH 5/6] Update Dockerfile yet more... evil commands.... From e2fb1f1d494c33e8d8b0e775f51cd2660d0730b1 Mon Sep 17 00:00:00 2001 From: Jacob Gadikian Date: Thu, 20 Aug 2015 04:46:23 +0700 Subject: [PATCH 6/6] Update Dockerfile Easier is better. --- Dockerfile | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/Dockerfile b/Dockerfile index d4f21d8..c25da37 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,27 +1,2 @@ -FROM debian:jessie - -MAINTAINER "Diego Marangoni" - -RUN apt-get update -RUN apt-get install -y curl -RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0x5a16e7281be7a449 -RUN echo deb http://dl.hhvm.com/debian jessie main | tee /etc/apt/sources.list.d/hhvm.list -RUN curl -sL https://deb.nodesource.com/setup_iojs_3.x | bash - -RUN echo '{ "allow_root": true }' > /root/.bowerrc -RUN apt-get clean && \ - apt-get update && \ - apt-get install -y sqlite hhvm build-essential git iojs && \ - rm -rf /var/lib/apt/lists/* - -RUN npm install -g bower -RUN rm -rf /etc/hhvm -RUN git clone https://github.com/fruux/sabre-katana /etc/hhvm -RUN curl -sS https://getcomposer.org/installer | hhvm --php -dHttp.SlowQueryThreshold=30000 -RUN mv composer.phar /usr/local/bin/composer -ENV alias composer="hhvm -v ResourceLimit.SocketDefaultTimeout=30 -v Http.SlowQueryThreshold=30000 -v Eval.Jit=false /usr/local/bin/composer" - - -WORKDIR /etc/hhvm -RUN make - -CMD ["hhvm", "-v Http.SlowQueryThreshold=30000", "-v Eval.Jit=false", "-v ResourceLimit.SocketDefaultTimeout=30"] +FROM php:5.6-apache +COPY . /var/www/html/