[roller] branch master updated: updated container setup.

[mbien]

This is an automated email from the ASF dual-hosted git repository.

mbien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git


The following commit(s) were added to refs/heads/master by this push:
     new b49e2a7  updated container setup.
     new 1c5edce  Merge pull request #110 from mbien/containerfile
b49e2a7 is described below

commit b49e2a7ffcbb8ebb30e3a85781ea2448dad9bc82
Author: Michael Bien <mbie...@gmail.com>
AuthorDate: Wed Dec 22 02:33:58 2021 +0100

    updated container setup.
    
     - fixed urls
     - upgraded to jdk17 and latest lib versions
     - better signal handling (made sure container stop signal propagates to 
tomcat)
---
 Dockerfile            | 17 +++++++++--------
 docker/entry-point.sh |  4 +---
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 29410a2..872061a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,9 +21,9 @@
 
 # STAGE 1 - BUILD ------------------------------------------------
 
-FROM maven:3.6.0-jdk-11-slim as builder
+FROM maven:3-openjdk-17-slim as builder
 
-COPY . /project/
+COPY ./docker /project/docker
 
 # Build Apache Roller
 
@@ -31,13 +31,14 @@ WORKDIR /tmp
 RUN apt-get update && apt-get install -y git
 RUN git clone https://github.com/apache/roller.git
 WORKDIR /tmp/roller
-RUN git checkout roller-6.0.x; \
+# change to branch/tag you prefer
+RUN git checkout tags/roller-6.1.0; \
 mvn -Duser.home=/builder/home -DskipTests=true -B clean install
 
 
 # STAGE 2 - PACKAGE ------------------------------------------------
 
-FROM tomcat:9.0.20-jre11-slim
+FROM tomcat:9-jdk17-openjdk-slim
 
 # Remove existing Tomcat webapps
 
@@ -69,9 +70,9 @@ RUN mkdir -p data/mediafiles data/searchindex
 
 WORKDIR /usr/local/tomcat/lib
 RUN apt-get update && apt-get install -y wget
-RUN wget -O postgresql.jar 
https://jdbc.postgresql.org/download/postgresql-9.4-1202.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
+RUN wget -O postgresql.jar 
https://jdbc.postgresql.org/download/postgresql-42.3.1.jar
+RUN wget https://repo1.maven.org/maven2/javax/mail/mail/1.4.7/mail-1.4.7.jar
+#RUN wget 
https://repo1.maven.org/maven2/javax/activation/activation/1.1.1/activation-1.1.1.jar
 
 # Add Roller entry-point and go!
 
@@ -81,4 +82,4 @@ RUN chgrp -R 0 /usr/local/tomcat
 RUN chmod -R g+rw /usr/local/tomcat
 
 WORKDIR /usr/local/tomcat
-ENTRYPOINT /usr/local/tomcat/bin/entry-point.sh
+CMD [ "/usr/local/tomcat/bin/entry-point.sh" ]
diff --git a/docker/entry-point.sh b/docker/entry-point.sh
index 18c74ac..4d78401 100755
--- a/docker/entry-point.sh
+++ b/docker/entry-point.sh
@@ -29,6 +29,4 @@ database.jdbc.password=${DATABASE_JDBC_PASSWORD}
 EOF
 
 /usr/local/tomcat/bin/wait-for-it.sh ${DATABASE_HOST}
-/usr/local/tomcat/bin/catalina.sh run
-
-
+exec /usr/local/tomcat/bin/catalina.sh run