You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2016/03/14 17:35:43 UTC
[4/4] struts-site git commit: Uses dedicated shell script to start
Jekyll
Uses dedicated shell script to start Jekyll
Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/3a87e1b5
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/3a87e1b5
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/3a87e1b5
Branch: refs/heads/master
Commit: 3a87e1b5b34cd198ca59c101138737c2e632be7a
Parents: d4509ab
Author: Lukasz Lenart <lu...@gmail.com>
Authored: Fri Mar 4 11:51:15 2016 +0100
Committer: Lukasz Lenart <lu...@gmail.com>
Committed: Mon Mar 14 17:35:27 2016 +0100
----------------------------------------------------------------------
docker/Dockerfile | 3 ++-
docker/run-jekyll.sh | 4 ++++
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts-site/blob/3a87e1b5/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 58738cf..ca7c0dc 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -25,6 +25,7 @@ RUN \
mkdir -p /srv/jekyll && \
chown jekyll:jekyll /srv/jekyll && \
echo "jekyll ALL=NOPASSWD:ALL" >> /etc/sudoers
+ADD run-jekyll.sh /usr/bin/run-jekyll.sh
WORKDIR /srv/jekyll
EXPOSE 4000
USER jekyll
@@ -54,4 +55,4 @@ ENV HOME /home/jekyll
ENV PATH ${PATH}:${HOME}/.rbenv/plugins/ruby-build/bin
ENV PATH ${PATH}:${HOME}/.rbenv/bin
ENV PATH ${PATH}:${HOME}/.rbenv/shims
-CMD ["bundle", "exec", "jekyll", "serve", "--watch", "--trace", "--host=0.0.0.0"]
\ No newline at end of file
+ENTRYPOINT ["/usr/bin/run-jekyll.sh"]
http://git-wip-us.apache.org/repos/asf/struts-site/blob/3a87e1b5/docker/run-jekyll.sh
----------------------------------------------------------------------
diff --git a/docker/run-jekyll.sh b/docker/run-jekyll.sh
new file mode 100755
index 0000000..c0cc54f
--- /dev/null
+++ b/docker/run-jekyll.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+bundle install
+bundle exec jekyll serve --watch --trace --host=0.0.0.0