projects
/
pnews.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0c10039
)
improve image build
author
Jean-Philippe Orsini
<orsinije@fr.ibm.com>
Tue, 17 Oct 2017 07:22:33 +0000
(09:22 +0200)
committer
Jean-Philippe Orsini
<orsinije@fr.ibm.com>
Tue, 17 Oct 2017 07:22:33 +0000
(09:22 +0200)
war/Dockerfile
patch
|
blob
|
history
war/build_docker_image.sh
patch
|
blob
|
history
war/run_from_image.sh
patch
|
blob
|
history
war/src/main/java/pnews/servlet/ArticleProvider.java
patch
|
blob
|
history
diff --git
a/war/Dockerfile
b/war/Dockerfile
index
223b4df
..
b87c2b5
100644
(file)
--- 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
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
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
(executable)
--- a/
war/build_docker_image.sh
+++ b/
war/build_docker_image.sh
@@
-4,4
+4,12
@@
set -e
DOCKER_IMG="pnews"
DOCKER_IMG="pnews"
+mvn clean install
+
+docker pull websphere-liberty:kernel
+
docker build -t "$DOCKER_IMG" .
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
(executable)
--- a/
war/run_from_image.sh
+++ b/
war/run_from_image.sh
@@
-1,3
+1,3
@@
#!/bin/bash
#!/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
(file)
--- 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) {
}
private static Article toArticle(String link, SyndEntry entry, SyndFeed feed) {
- String desc, title, thumbnail;
+ String desc, title, thumbnail
, feedTitle
;
Date date;
Date date;
+ feedTitle = feed.getTitle();
+ if (feedTitle != null)
+ feedTitle = feedTitle.trim();
+
thumbnail = null;
for (SyndEnclosure e: entry.getEnclosures()) {
if (e.getType().startsWith("image/"))
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;
desc = Jsoup.parse(entry.getDescription().getValue()).text();
} else {
desc = null;
- LOG.severe("No description for " + feed
.getTitle()
+ " - " + title);
+ LOG.severe("No description for " + feed
Title
+ " - " + title);
}
date = entry.getPublishedDate();
if (date == null)
date = entry.getUpdatedDate();
if (date == null)
}
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 " + feed
Title
+ " - " + title + " does not have a date");
- return new Article(link, title, desc, thumbnail, date,
t
itle);
+ return new Article(link, title, desc, thumbnail, date,
feedT
itle);
}
private void addArticles(Category cat, SyndFeed feed) {
}
private void addArticles(Category cat, SyndFeed feed) {