(jspwiki) branch master updated: fix Dockerfile build - no version bump

[juanpablo]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 4bf69d9b2 fix Dockerfile build - no version bump
4bf69d9b2 is described below

commit 4bf69d9b21b77c60b91e4d53321461be1cb323b6
Author: Juan Pablo Santos Rodríguez <juanpablo.san...@gmail.com>
AuthorDate: Sat May 25 14:58:39 2024 +0200

    fix Dockerfile build - no version bump
---
 ChangeLog.md | 2 ++
 Dockerfile   | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index b9de9e965..a5d4f90b2 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -23,6 +23,8 @@ under the License.
 
 * [JSPWIKI-1186](https://issues.apache.org/jira/browse/JSPWIKI-1186) - 
Windows, `Install.jsp` double escapes the `jspwiki.workDir` and nothing else
 
+* Fix Dockerfile build, broken on 2.12.2-git-14
+
 * Dependency updates
     * Gson to 2.11.0 (closes [PR 
#343](https://github.com/apache/jspwiki/pull/343), thanks to Dependabot)
     * Mockito to 5.12.0 (closes [PR 
#341](https://github.com/apache/jspwiki/pull/341), thanks to Dependabot)
diff --git a/Dockerfile b/Dockerfile
index 361c682f3..24db70d47 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-FROM maven:3.8-jdk-11 as package
+FROM maven:3.9-jdk-11 as package
 
 WORKDIR /tmp
 
@@ -30,7 +30,7 @@ RUN set -x \
 FROM tomcat:9.0
 
 COPY --from=package /tmp/jspwiki-war/target/JSPWiki.war /tmp
-COPY --from=package 
/tmp/jspwiki-wikipages/en/target/jspwiki-wikipages-en-*.zip /tmp
+COPY --from=package 
/tmp/jspwiki-wikipages/en/target/jspwiki-wikipages-en-*-jspwiki.zip /tmp
 COPY docker-files/log4j2.properties /tmp
 COPY docker-files/tomcat-users.xml $CATALINA_HOME/conf/tomcat-users.xml
 
@@ -71,7 +71,7 @@ RUN set -x \
  && rm /tmp/JSPWiki.war \
 # deploy wiki pages
  && cd /tmp/ \
- && unzip -q jspwiki-wikipages-en-*.zip \
+ && unzip -q jspwiki-wikipages-en-*-jspwiki.zip \
  && mv jspwiki-wikipages-en-*/* /var/jspwiki/pages/ \
  && rm -rf jspwiki-wikipages-en-* \
 # move the userdatabase.xml and groupdatabase.xml to /var/jspwiki/etc