From: Jean-Philippe Orsini <orsinije@fr.ibm.com>
Date: Tue, 17 Oct 2017 07:22:33 +0000 (+0200)
Subject: improve image build
X-Git-Url: http://git.wpitchoune.net/gitweb/?p=pnews.git;a=commitdiff_plain;h=a36ee3cb4f517b159fa51539a772c9e53bf2f13c

improve image build
---

diff --git a/war/Dockerfile b/war/Dockerfile
index 223b4df..b87c2b5 100644
--- a/war/Dockerfile
+++ b/war/Dockerfile
@@ -4,4 +4,7 @@ COPY server.xml /config/
 COPY server.env /config/
 COPY target/pnews-1.0.war /config/apps/pnews-1.0.war
 
+RUN apt-get update
+RUN apt-get dist-upgrade
+
 RUN installUtility install --acceptLicense servlet-3.1
diff --git a/war/build_docker_image.sh b/war/build_docker_image.sh
index 518a3c8..7dc9076 100755
--- a/war/build_docker_image.sh
+++ b/war/build_docker_image.sh
@@ -4,4 +4,12 @@ set -e
 
 DOCKER_IMG="pnews"
 
+mvn clean install
+
+docker pull websphere-liberty:kernel
+
 docker build -t "$DOCKER_IMG" .
+
+docker tag pnews jeanfi/pnews
+
+docker push jeanfi/pnews
diff --git a/war/run_from_image.sh b/war/run_from_image.sh
index b917422..efe5236 100755
--- a/war/run_from_image.sh
+++ b/war/run_from_image.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker run -ti --name pnews -p 9080:9080 jeanfi/pnews
+docker run -ti --name pnews -p 9080:9080 -p 9443:9443 -v pnews:/opt/ibm/wlp/usr/servers/defaultServer jeanfi/pnews
diff --git a/war/src/main/java/pnews/servlet/ArticleProvider.java b/war/src/main/java/pnews/servlet/ArticleProvider.java
index d3e4f3d..5e7d429 100644
--- a/war/src/main/java/pnews/servlet/ArticleProvider.java
+++ b/war/src/main/java/pnews/servlet/ArticleProvider.java
@@ -121,9 +121,13 @@ public class ArticleProvider {
         }
         
         private static Article toArticle(String link, SyndEntry entry, SyndFeed feed) {
-                String desc, title, thumbnail;
+                String desc, title, thumbnail, feedTitle;
                 Date date;
                 
+                feedTitle = feed.getTitle();
+                if (feedTitle != null)
+                        feedTitle = feedTitle.trim();
+                
                 thumbnail = null;
                 for (SyndEnclosure e: entry.getEnclosures()) {
                         if (e.getType().startsWith("image/"))
@@ -140,16 +144,16 @@ public class ArticleProvider {
                         desc = Jsoup.parse(entry.getDescription().getValue()).text();
                 } else {       
                         desc = null;
-                        LOG.severe("No description for " + feed.getTitle() + " - " + title);
+                        LOG.severe("No description for " + feedTitle + " - " + title);
                 }
                 
                 date = entry.getPublishedDate();
                 if (date == null)
                         date = entry.getUpdatedDate();
                 if (date == null)
-                        LOG.severe("The article " + feed.getTitle() + " - " + title + " does not have a date");
+                        LOG.severe("The article " + feedTitle + " - " + title + " does not have a date");
                                      
-                return new Article(link, title, desc, thumbnail, date, title);
+                return new Article(link, title, desc, thumbnail, date, feedTitle);
         }
         
         private void addArticles(Category cat, SyndFeed feed) {