From 2acbbff4de1916d335d34f6d5a682ea980428bda Mon Sep 17 00:00:00 2001 From: Naoki AINOYA Date: Thu, 9 Jul 2015 01:05:11 +0900 Subject: [PATCH] wip: extract block which builds front page with grunt as task which is executed externaly --- docker/pool/Dockerfile | 19 ++----------------- docker/pool/build-screen/app/index.html | 1 - 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/docker/pool/Dockerfile b/docker/pool/Dockerfile index eb64167..f10cdc9 100644 --- a/docker/pool/Dockerfile +++ b/docker/pool/Dockerfile @@ -34,23 +34,8 @@ RUN /usr/local/bin/gem build builder.gemspec RUN /usr/local/bin/gem install builder-0.0.1.gem # Add mod_mruby handler to manage request -ADD handlers /app/handlers - -# Install build-screen -RUN mkdir -p /app/handlers/resources -RUN mkdir /tmp/build-screen -# Add package.json beforehand then execute npm install -ADD build-screen/package.json /tmp/build-screen/package.json -WORKDIR /tmp/build-screen -RUN npm install -ADD build-screen /tmp/build-screen-2 -RUN cp -nr /tmp/build-screen-2/* /tmp/build-screen -RUN cp -nr /tmp/build-screen-2/.[^.]* /tmp/build-screen -# For bower install -RUN git config --global url.https://.insteadOf git:// -RUN $(npm bin)/bower --allow-root install -RUN $(npm bin)/grunt build -RUN mv /tmp/build-screen/dist /app/handlers/resources/build-screen + +COPY ./build-screen/dist /app/handlers/resources/build-screen # Add util scripts for handling containers ADD scripts /app/scripts diff --git a/docker/pool/build-screen/app/index.html b/docker/pool/build-screen/app/index.html index c7e6b04..feba4d9 100644 --- a/docker/pool/build-screen/app/index.html +++ b/docker/pool/build-screen/app/index.html @@ -8,7 +8,6 @@ -