Simple Dockerfile for Roller and docker-compose setup for running Tomcat, PostgreSQL and Roller.
diff --git a/deployment/docker-compose/Dockerfile b/deployment/docker-compose/Dockerfile
index d43f42c..eb717c0 100644
--- a/deployment/docker-compose/Dockerfile
+++ b/deployment/docker-compose/Dockerfile
@@ -17,8 +17,8 @@
FROM tomcat:8.0-jre8-alpine
ARG STORAGE_ROOT=/var/lib/roller/data
-ARG DATABASE_JDBC_DRIVERCLASS=com.mysql.jdbc.Driver
-ARG DATABASE_JDBC_CONNECTIONURL=mysql://localhost:3306/rollerdb?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&mysqlEncoding=utf8
+ARG DATABASE_JDBC_DRIVERCLASS=org.postgresql.Driver
+ARG DATABASE_JDBC_CONNECTIONURL=jdbc:postgresql://postgresql/rollerdb
ARG DATABASE_JDBC_USERNAME=scott
ARG DATABASE_JDBC_PASSWORD=tiger
@@ -26,7 +26,7 @@
# get Roller from Apache mirror
WORKDIR /usr/local/roller
-RUN wget -O roller.tar.gz http://www-us.apache.org/dist/roller/roller-5.1/v5.1.2/roller-release-5.1.2-standard.tar.gz
+RUN wget -O roller.tar.gz http://www-us.apache.org/dist/roller/roller-5.2/v5.2.2/roller-release-5.2.2-standard.tar.gz
RUN tar -xf roller.tar.gz
RUN ln -s roller-release-*/ release
@@ -41,6 +41,7 @@
WORKDIR /usr/local/tomcat/lib
RUN wget -O mysql.jar http://repo2.maven.org/maven2/mysql/mysql-connector-java/5.1.43/mysql-connector-java-5.1.43.jar
+RUN wget -O postgresql.jar http://repo2.maven.org/maven2/postgresql/postgresql/9.1-901.jdbc4/postgresql-9.1-901.jdbc4.jar
RUN wget http://repo2.maven.org/maven2/javax/mail/mail/1.4.1/mail-1.4.1.jar
RUN wget http://repo2.maven.org/maven2/javax/activation/activation/1.1.1/activation-1.1.1.jar
@@ -50,5 +51,11 @@
RUN chgrp -R 0 /usr/local/tomcat
RUN chmod -R g+rw /usr/local/tomcat
+ENV STORAGE_ROOT ${STORAGE_ROOT}
+ENV DATABASE_JDBC_DRIVERCLASS ${DATABASE_JDBC_DRIVERCLASS}
+ENV DATABASE_JDBC_CONNECTIONURL ${DATABASE_JDBC_CONNECTIONURL}
+ENV DATABASE_JDBC_USERNAME ${DATABASE_JDBC_USERNAME}
+ENV DATABASE_JDBC_PASSWORD ${DATABASE_JDBC_PASSWORD}
+
WORKDIR /usr/local/tomcat
ENTRYPOINT /usr/local/tomcat/bin/entry-point.sh
diff --git a/deployment/docker-compose/docker-compose.yml b/deployment/docker-compose/docker-compose.yml
index 5aed499..220bb94 100644
--- a/deployment/docker-compose/docker-compose.yml
+++ b/deployment/docker-compose/docker-compose.yml
@@ -8,12 +8,19 @@
- "5432:5432"
volumes:
- type: bind
- source: /Users/dave/src/apache-roller/tomcat-base/data/postgresql
+ source: /Users/dave/src/apache-roller/deployment/docker-compose/postgresql-data
target: /var/lib/postgresql/data
environment:
- POSTGRES_DB=rollerdb
- POSTGRES_USER=scott
- POSTGRES_PASSWORD=tiger
-
+ roller:
+ image: "roller:6.0.0-SNAPSHOT"
+ ports:
+ - "8080:8080"
+ volumes:
+ - type: bind
+ source: /Users/dave/src/apache-roller/deployment/docker-compose/roller-data
+ target: /var/lib/roller/data