[3/5] struts-site git commit: Adds scripts to build the image
Adds scripts to build the image Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/50f03d22 Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/50f03d22 Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/50f03d22 Branch: refs/heads/master Commit: 50f03d22aa15cef811aa45f9caad9d2c577b31e1 Parents: 2bb4bd1 Author: Lukasz Lenart Authored: Mon Feb 8 08:21:21 2016 +0100 Committer: Lukasz Lenart Committed: Mon Feb 8 08:21:21 2016 +0100 -- docker-build.fish | 2 ++ docker-build.sh | 2 ++ 2 files changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/struts-site/blob/50f03d22/docker-build.fish -- diff --git a/docker-build.fish b/docker-build.fish new file mode 100755 index 000..fc017a0 --- /dev/null +++ b/docker-build.fish @@ -0,0 +1,2 @@ +#!/usr/local/bin/fish +docker build -t theapachestruts/struts-site-jekyll --pull docker/ http://git-wip-us.apache.org/repos/asf/struts-site/blob/50f03d22/docker-build.sh -- diff --git a/docker-build.sh b/docker-build.sh new file mode 100755 index 000..ae6a6b3 --- /dev/null +++ b/docker-build.sh @@ -0,0 +1,2 @@ +#!/bin/sh +docker build -t theapachestruts/struts-site-jekyll --pull docker/
[5/5] struts-site git commit: Adds force polling to properly update assets
Adds force polling to properly update assets Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/270c9e77 Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/270c9e77 Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/270c9e77 Branch: refs/heads/master Commit: 270c9e7707ec49ab7cf89a452712c256289829f2 Parents: 55ad7d2 Author: Lukasz Lenart Authored: Mon Feb 8 09:14:48 2016 +0100 Committer: Lukasz Lenart Committed: Mon Feb 8 09:14:48 2016 +0100 -- docker-run.fish | 2 +- docker-run.sh | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts-site/blob/270c9e77/docker-run.fish -- diff --git a/docker-run.fish b/docker-run.fish index be9d2ff..2c3f69e 100755 --- a/docker-run.fish +++ b/docker-run.fish @@ -1,2 +1,2 @@ #!/usr/local/bin/fish -docker run -v $PWD:/srv/jekyll -it -p 4000:4000 theapachestruts/struts-site-jekyll bundle exec jekyll serve --watch --trace --host=0.0.0.0 +docker run -v $PWD:/srv/jekyll -it -p 4000:4000 theapachestruts/struts-site-jekyll bundle exec jekyll serve --watch --trace --host=0.0.0.0 --force_polling http://git-wip-us.apache.org/repos/asf/struts-site/blob/270c9e77/docker-run.sh -- diff --git a/docker-run.sh b/docker-run.sh index 3c8856c..64d3a9b 100755 --- a/docker-run.sh +++ b/docker-run.sh @@ -1,4 +1,2 @@ #!/bin/sh - -docker run -v $(pwd):/srv/jekyll -it -p 4000:4000 theapachestruts/struts-site-jekyll bundle exec jekyll serve --watch --trace --host=0.0.0.0 - +docker run -v $(pwd):/srv/jekyll -it -p 4000:4000 theapachestruts/struts-site-jekyll bundle exec jekyll serve --watch --trace --host=0.0.0.0 --force_polling
[1/5] struts-site git commit: Adds missing dependencies and cleanups
Repository: struts-site
Updated Branches:
refs/heads/master 3931c4315 -> 270c9e770
Adds missing dependencies and cleanups
Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/a6b16f15
Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/a6b16f15
Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/a6b16f15
Branch: refs/heads/master
Commit: a6b16f153229dcdc65dbb3a89cd6112c2a6606e0
Parents: 3931c43
Author: Lukasz Lenart
Authored: Mon Feb 8 08:18:50 2016 +0100
Committer: Lukasz Lenart
Committed: Mon Feb 8 08:18:50 2016 +0100
--
docker/Dockerfile | 19 +++
1 file changed, 11 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/struts-site/blob/a6b16f15/docker/Dockerfile
--
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 9b4ec36..58738cf 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -4,23 +4,29 @@ LABEL Description="This image is used to support building
Apache Struts main web
RUN \
apt-get update && \
apt-get install -y \
+make \
+gcc \
+sudo \
+netcat \
+iproute \
+net-tools \
vim \
bzip2 \
-gcc \
git-core \
-make \
libssl-dev \
libreadline-dev \
zlib1g-dev \
node \
-sudo \
curl && \
-
+ apt-get clean && \
+
addgroup --system --gid 1000 jekyll && \
adduser --system --ingroup jekyll --uid 1000 --home /home/jekyll
--disabled-password jekyll && \
mkdir -p /srv/jekyll && \
chown jekyll:jekyll /srv/jekyll && \
echo "jekyll ALL=NOPASSWD:ALL" >> /etc/sudoers
+WORKDIR /srv/jekyll
+EXPOSE 4000
USER jekyll
RUN \
cd && \
@@ -44,11 +50,8 @@ RUN \
gem clean && gem install bundler --no-document && \
sudo rm -rf /usr/lib/ruby/gems/*/cache/*.gem
-WORKDIR /srv/jekyll
-EXPOSE 4000
ENV HOME /home/jekyll
-ENV HOSTNAME struts-jekyll
ENV PATH ${PATH}:${HOME}/.rbenv/plugins/ruby-build/bin
ENV PATH ${PATH}:${HOME}/.rbenv/bin
ENV PATH ${PATH}:${HOME}/.rbenv/shims
-CMD ["bundle", "install"]
\ No newline at end of file
+CMD ["bundle", "exec", "jekyll", "serve", "--watch", "--trace",
"--host=0.0.0.0"]
\ No newline at end of file
[4/5] struts-site git commit: Drops unused script
Drops unused script Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/55ad7d24 Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/55ad7d24 Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/55ad7d24 Branch: refs/heads/master Commit: 55ad7d24b53d717e5888d49c4a931acbc01627b4 Parents: 50f03d2 Author: Lukasz Lenart Authored: Mon Feb 8 08:21:47 2016 +0100 Committer: Lukasz Lenart Committed: Mon Feb 8 08:21:47 2016 +0100 -- build_cms.sh | 3 --- 1 file changed, 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts-site/blob/55ad7d24/build_cms.sh -- diff --git a/build_cms.sh b/build_cms.sh deleted file mode 100755 index 9d3f594..000 --- a/build_cms.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -jekyll build
[2/5] struts-site git commit: Adds proper host binding
Adds proper host binding Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/2bb4bd1c Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/2bb4bd1c Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/2bb4bd1c Branch: refs/heads/master Commit: 2bb4bd1ca461ee63d10da6f48ec0e792f7f554bd Parents: a6b16f1 Author: Lukasz Lenart Authored: Mon Feb 8 08:19:42 2016 +0100 Committer: Lukasz Lenart Committed: Mon Feb 8 08:19:42 2016 +0100 -- docker-run.fish | 2 +- docker-run.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts-site/blob/2bb4bd1c/docker-run.fish -- diff --git a/docker-run.fish b/docker-run.fish index dc883c1..be9d2ff 100755 --- a/docker-run.fish +++ b/docker-run.fish @@ -1,2 +1,2 @@ #!/usr/local/bin/fish -docker run -v $PWD:/srv/jekyll -it -p 4000:4000 theapachestruts/struts-site-jekyll bundle exec jekyll serve --watch +docker run -v $PWD:/srv/jekyll -it -p 4000:4000 theapachestruts/struts-site-jekyll bundle exec jekyll serve --watch --trace --host=0.0.0.0 http://git-wip-us.apache.org/repos/asf/struts-site/blob/2bb4bd1c/docker-run.sh -- diff --git a/docker-run.sh b/docker-run.sh index 7b15bc4..3c8856c 100755 --- a/docker-run.sh +++ b/docker-run.sh @@ -1,4 +1,4 @@ #!/bin/sh -docker run -v $(pwd):/srv/jekyll -it -p 4000:4000 theapachestruts/struts-site-jekyll bundle exec jekyll serve --watch +docker run -v $(pwd):/srv/jekyll -it -p 4000:4000 theapachestruts/struts-site-jekyll bundle exec jekyll serve --watch --trace --host=0.0.0.0
struts-site git commit: Update README
Repository: struts-site Updated Branches: refs/heads/master 270c9e770 -> cebb28bd0 Update README Project: http://git-wip-us.apache.org/repos/asf/struts-site/repo Commit: http://git-wip-us.apache.org/repos/asf/struts-site/commit/cebb28bd Tree: http://git-wip-us.apache.org/repos/asf/struts-site/tree/cebb28bd Diff: http://git-wip-us.apache.org/repos/asf/struts-site/diff/cebb28bd Branch: refs/heads/master Commit: cebb28bd0aea8c011e516e912379aacd86cb758a Parents: 270c9e7 Author: Lukasz Lenart Authored: Mon Feb 8 09:19:57 2016 +0100 Committer: Lukasz Lenart Committed: Mon Feb 8 09:19:57 2016 +0100 -- README.md | 16 ++-- 1 file changed, 14 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/struts-site/blob/cebb28bd/README.md -- diff --git a/README.md b/README.md index 81a2044..226a2f8 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,21 @@ -This project is used to update main Apache Struts website http://struts.apache.org/ +This project is used to update the main Apache Struts website http://struts.apache.org/ You must manually push changes to production via SVN. Site is generated by Jekyll and uses pure html either markdown format. -To test website locally: +To test website locally you can use the below command: > bundle exec jekyll serve -w --trace --host 0.0.0.0 +or you can use `Docker`` (please install it first) with one of the provided scripts: + + > ./docker-run.fish + +when running fish-shell, or: + + > ./docker-run.sh + +when running Bash or Sh. + All pages are generated into 'content' folder. + +There are two scripts used to build the image but this should be used only when `Dockerfile` was modified. \ No newline at end of file
