From 4d893229143ed1c1c0cf770ff397a22717859651 Mon Sep 17 00:00:00 2001 From: Frederik Batuna Date: Tue, 1 Nov 2016 11:12:58 -0700 Subject: [PATCH 1/6] add: git, mercurial --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 81eb5e7..566fadf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,6 +20,10 @@ ENV CATALINA_TMPDIR /usr/local/tomcat/temp ENV JRE_HOME /usr ENV CLASSPATH /usr/local/tomcat/bin/bootstrap.jar:/usr/local/tomcat/bin/tomcat-juli.jar +RUN apt-get update && apt-get install -y \ + git \ + mercurial + WORKDIR $CATALINA_HOME RUN /opengrok-0.12.1.5/bin/OpenGrok deploy From 06d4957e5f9e17db1cfd0ad2889be60f5ded216d Mon Sep 17 00:00:00 2001 From: Frederik Batuna Date: Tue, 1 Nov 2016 12:12:50 -0700 Subject: [PATCH 2/6] Update Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 566fadf..ed494a1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,8 @@ RUN mkdir /src RUN mkdir /data RUN ln -s /data /var/opengrok RUN ln -s /src /var/opengrok/src -RUN wget "https://java.net/projects/opengrok/downloads/download/opengrok-0.12.1.5.tar.gz" -O /tmp/opengrok-0.12.1.5.tar.gz -RUN wget "http://ftp.us.debian.org/debian/pool/main/e/exuberant-ctags/exuberant-ctags_5.9~svn20110310-9_amd64.deb" -O /tmp/exuberant-ctags_5.9-svn20110310-9_amd64.deb +RUN wget "https://java.net/projects/opengrok/downloads/download/opengrok-0.12.1.6.tar.gz" -O /tmp/opengrok-0.12.1.5.tar.gz +RUN wget "http://ftp.us.debian.org/debian/pool/main/e/exuberant-ctags/exuberant-ctags_5.9~svn20110310-11_amd64.deb" -O /tmp/exuberant-ctags_5.9-svn20110310-9_amd64.deb RUN tar zxvf /tmp/opengrok-0.12.1.5.tar.gz -C / RUN dpkg -i /tmp/exuberant-ctags_5.9-svn20110310-9_amd64.deb From 7aaa7e8e8eb262936f5ec029ce425d52a1c9dd18 Mon Sep 17 00:00:00 2001 From: Frederik Batuna Date: Tue, 1 Nov 2016 12:13:47 -0700 Subject: [PATCH 3/6] Update start.sh --- scripts/start.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/start.sh b/scripts/start.sh index 4dcff4a..9a1e5f3 100755 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -22,7 +22,7 @@ start_opengrok(){ while ! ( ps aux|grep -q org.apache.catalina.startup.Bootstrap ); do sleep 1; done - OpenGrok index /src + # OpenGrok index /src } start_opengrok & From 7fdf8c8a05edc01ec1a8bb4a002b04fa229f4264 Mon Sep 17 00:00:00 2001 From: Frederik Batuna Date: Tue, 1 Nov 2016 12:23:50 -0700 Subject: [PATCH 4/6] Update Dockerfile --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ed494a1..e23bd9f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,9 @@ RUN mkdir /src RUN mkdir /data RUN ln -s /data /var/opengrok RUN ln -s /src /var/opengrok/src -RUN wget "https://java.net/projects/opengrok/downloads/download/opengrok-0.12.1.6.tar.gz" -O /tmp/opengrok-0.12.1.5.tar.gz +RUN wget "https://github.com/OpenGrok/OpenGrok/files/467358/opengrok-0.12.1.6.tar.gz.zip" -O /tmp/opengrok-0.12.1.5.tar.gz.zip RUN wget "http://ftp.us.debian.org/debian/pool/main/e/exuberant-ctags/exuberant-ctags_5.9~svn20110310-11_amd64.deb" -O /tmp/exuberant-ctags_5.9-svn20110310-9_amd64.deb +RUN unzip /tmp/opengrok-0.12.1.5.tar.gz.zip -d /tmp RUN tar zxvf /tmp/opengrok-0.12.1.5.tar.gz -C / RUN dpkg -i /tmp/exuberant-ctags_5.9-svn20110310-9_amd64.deb From 7cdc0be7ed3fe72614525a0bd9ebae2fe0c74efc Mon Sep 17 00:00:00 2001 From: Frederik Batuna Date: Tue, 1 Nov 2016 12:27:22 -0700 Subject: [PATCH 5/6] Update Dockerfile --- Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index e23bd9f..ebc8155 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,17 +3,17 @@ RUN mkdir /src RUN mkdir /data RUN ln -s /data /var/opengrok RUN ln -s /src /var/opengrok/src -RUN wget "https://github.com/OpenGrok/OpenGrok/files/467358/opengrok-0.12.1.6.tar.gz.zip" -O /tmp/opengrok-0.12.1.5.tar.gz.zip -RUN wget "http://ftp.us.debian.org/debian/pool/main/e/exuberant-ctags/exuberant-ctags_5.9~svn20110310-11_amd64.deb" -O /tmp/exuberant-ctags_5.9-svn20110310-9_amd64.deb -RUN unzip /tmp/opengrok-0.12.1.5.tar.gz.zip -d /tmp -RUN tar zxvf /tmp/opengrok-0.12.1.5.tar.gz -C / -RUN dpkg -i /tmp/exuberant-ctags_5.9-svn20110310-9_amd64.deb +RUN wget "https://github.com/OpenGrok/OpenGrok/files/467358/opengrok-0.12.1.6.tar.gz.zip" -O /tmp/opengrok-0.12.1.6.tar.gz.zip +RUN wget "http://ftp.us.debian.org/debian/pool/main/e/exuberant-ctags/exuberant-ctags_5.9~svn20110310-11_amd64.deb" -O /tmp/exuberant-ctags_5.9-svn20110310-11_amd64.deb +RUN unzip /tmp/opengrok-0.12.1.6.tar.gz.zip -d /tmp +RUN tar zxvf /tmp/opengrok-0.12.1.6.tar.gz -C / +RUN dpkg -i /tmp/exuberant-ctags_5.11-svn20110310-9_amd64.deb ENV SRC_ROOT /src ENV OPENGROK_TOMCAT_BASE /usr/local/tomcat ENV CATALINA_HOME /usr/local/tomcat ENV PATH $CATALINA_HOME/bin:$PATH -ENV PATH /opengrok-0.12.1.5/bin:$PATH +ENV PATH /opengrok-0.12.1.6/bin:$PATH ENV CATALINA_BASE /usr/local/tomcat ENV CATALINA_HOME /usr/local/tomcat @@ -26,7 +26,7 @@ RUN apt-get update && apt-get install -y \ mercurial WORKDIR $CATALINA_HOME -RUN /opengrok-0.12.1.5/bin/OpenGrok deploy +RUN /opengrok-0.12.1.6/bin/OpenGrok deploy EXPOSE 8080 ADD scripts /scripts From e088d7632f998fd7de328894b3f2eae832361a8a Mon Sep 17 00:00:00 2001 From: Frederik Batuna Date: Tue, 1 Nov 2016 12:39:42 -0700 Subject: [PATCH 6/6] buildfix: opengrok version --- Dockerfile | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ebc8155..c33583b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ RUN wget "https://github.com/OpenGrok/OpenGrok/files/467358/opengrok-0.12.1.6.ta RUN wget "http://ftp.us.debian.org/debian/pool/main/e/exuberant-ctags/exuberant-ctags_5.9~svn20110310-11_amd64.deb" -O /tmp/exuberant-ctags_5.9-svn20110310-11_amd64.deb RUN unzip /tmp/opengrok-0.12.1.6.tar.gz.zip -d /tmp RUN tar zxvf /tmp/opengrok-0.12.1.6.tar.gz -C / -RUN dpkg -i /tmp/exuberant-ctags_5.11-svn20110310-9_amd64.deb +RUN dpkg -i /tmp/exuberant-ctags_5.9-svn20110310-11_amd64.deb ENV SRC_ROOT /src ENV OPENGROK_TOMCAT_BASE /usr/local/tomcat diff --git a/README.md b/README.md index 42da412..2877f7f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # OpenGrok: -opengrok version: [opengrok-0.12.1.5](https://java.net/projects/opengrok/downloads/download/opengrok-0.12.1.5.tar.gz) +opengrok version: [opengrok-0.12.1.6](https://github.com/OpenGrok/OpenGrok/files/467358/opengrok-0.12.1.6.tar.gz.zip) image base on: [tomcat:8.0](https://registry.hub.docker.com/_/tomcat/)