Skip to content

[WIP] extract block which builds front page with grunt as task which is executed externaly #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ainoya wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[WIP] extract block which builds front page with grunt as task which is executed externaly #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 2 additions & 17 deletions docker/pool/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion docker/pool/build-screen/app/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<!-- Place favicon.ico and apple-touch-icon.png in the root directory -->
<!-- build:css(.) /styles/vendor.css -->
<!-- bower:css -->
<link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.css" />
<!-- endbower -->
<!-- endbuild -->
<!-- build:css(.tmp) /styles/main.css -->
Expand Down