Merge pull request #39 from swapnilmmane/master
Added the AsciiDoc version of 'Install Guide' documentation
diff --git a/Dockerfile b/Dockerfile
index 2dcbcd4..28570de 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,7 +31,7 @@
RUN apt-get update && apt-get install -y git
RUN git clone https://github.com/apache/roller.git
WORKDIR /tmp/roller
-RUN git checkout bootstrap-ui; \
+RUN git checkout master; \
mvn -Duser.home=/builder/home -DskipTests=true -B clean install
diff --git a/doap_roller.rdf b/doap_roller.rdf
index 235e577..b3ea7f1 100644
--- a/doap_roller.rdf
+++ b/doap_roller.rdf
@@ -32,12 +32,19 @@
<description>Apache Roller is a full-featured, multi-user and group-blog server suitable for blog sites large and small. It runs as a Java web application that should be able to run on most any Java EE server and relational database. Roller's installation guide covers deployment on Tomcat, GlassFish, and JBoss application servers using a MySQL, Derby, or PostgreSQL database. Users however have reported success running Roller on other app servers and databases.
- Multi-user blogging: can support tens of thousands of users and blogs
- - Group blogging with three permisson levels (editor, author and limited)
+
+ - Group blogging with three permission levels (editor, author and limited)
+
- Support for comment moderation and comment spam prevention measures
+
- Bloggers have complete control over blog layout/style via Apache Velocity-driven templates
+
- Built-in search engine indexes weblog entry content
+
- Pluggable cache and rendering system
+
- Support for blog clients that support MetaWeblog API
+
- All blogs have entry and comment feeds in both RSS 2.0 and Atom 1.0 formats</description>
<bug-database rdf:resource="https://issues.apache.org/jira/browse/ROL" />
<mailing-list rdf:resource="https://cwiki.apache.org/confluence/display/ROLLER/Roller+Mailing+Lists" />
@@ -47,8 +54,8 @@
<release>
<Version>
<name>Current</name>
- <created>2014-06-27</created>
- <revision>5.0.4</revision>
+ <created>2019-07-22</created>
+ <revision>5.2.4</revision>
</Version>
</release>
<repository>
@@ -64,4 +71,4 @@
</foaf:Person>
</maintainer>
</Project>
-</rdf:RDF>
\ No newline at end of file
+</rdf:RDF>
diff --git a/docker-compose.yml b/docker-compose.yml
index 0288882..ba5c7b8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,10 +16,10 @@
# directory of this distribution.
-# Example Docker Compose setup for running Roller and PostreSQL locally
+# Example Docker Compose setup for running Roller and PostgreSQL locally
-version: '3.2'
+version: '3.7'
services:
@@ -37,8 +37,7 @@
- POSTGRES_PASSWORD=tiger
roller:
- image:
- build: .
+ build: .
ports:
- "8080:8080"
volumes:
