- use different config file (wikipedia.local.conf)

- use logback.xml to write log files and control behavior
- use different java image (8u131-alpine)
- update mysql-connector to 6.0.6

conf/wikipedia.conf

@@ -1 +1,2 @@
-// add your modified config values here
+// copy this file to wikipedia.local.conf
+// and add your values there

docker-compose.yml

@@ -5,7 +5,7 @@ services:
   wikipedia:
     image: lambdacube/wikipedia-api:latest
     ports:
-      - "8080:8080"
+      - "8088:8080"
     volumes:
       - ./logs:/usr/share/wikipedia/logs
       - ./conf:/usr/share/wikipedia/conf

pom.xml

@@ -32,7 +32,7 @@
 
     <groupId>org.lambda3.data.wikipedia</groupId>
     <artifactId>wikipedia-api</artifactId>
-    <version>2.0.3</version>
+    <version>2.0.4</version>
 
     <description>
         Small library that accesses the English Wikipedia API to download articles.

wikipedia-core/pom.xml

@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.lambda3.data.wikipedia</groupId>
         <artifactId>wikipedia-api</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -87,7 +87,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>6.0.5</version>
+            <version>6.0.6</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>

wikipedia-rest/pom.xml

@@ -32,7 +32,7 @@
     <parent>
         <groupId>org.lambda3.data.wikipedia</groupId>
         <artifactId>wikipedia-api</artifactId>
-        <version>2.0.3</version>
+        <version>2.0.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

wikipedia-rest/src/main/resources/Dockerfile-wikipedia

@@ -1,4 +1,4 @@
-FROM openjdk:8-jre
+FROM openjdk:8u131-jre-alpine
 
 WORKDIR /usr/share/wikipedia
 

wikipedia-rest/src/main/resources/start.sh

@@ -10,7 +10,7 @@ cmd="java -jar -server ${JAVA_OPTS} \
 	-Djava.net.preferIPv4Stack=true \
 	-Dfile.encoding=UTF-8 \
 	-Dlogback.configurationFile=${CONFDIR}/logback.xml \
-	-Dconfig.file=${CONFDIR}/wikipedia.conf \
+	-Dconfig.file=${CONFDIR}/wikipedia.local.conf \
 	${LIBDIR}/${project.artifactId}-${project.version}.jar"
 
 exec ${cmd}