From de887e5029bd655d5c915316db5949a51f1ecfa8 Mon Sep 17 00:00:00 2001
From: J0WI <J0WI@users.noreply.github.com>
Date: Tue, 30 Apr 2019 11:40:08 +0200
Subject: [PATCH] Use Debian slim variant (#18)
---
10/mysql-tomcat/Dockerfile | 2 +-
10/mysql-tomcat/xwiki/hibernate.cfg.xml | 2 +-
10/postgres-tomcat/Dockerfile | 2 +-
10/postgres-tomcat/xwiki/hibernate.cfg.xml | 2 +-
11/mysql-tomcat/Dockerfile | 2 +-
11/mysql-tomcat/xwiki/hibernate.cfg.xml | 2 +-
11/postgres-tomcat/Dockerfile | 2 +-
11/postgres-tomcat/xwiki/hibernate.cfg.xml | 2 +-
template/Dockerfile | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/10/mysql-tomcat/Dockerfile b/10/mysql-tomcat/Dockerfile
index dced527..15bb402 100644
--- a/10/mysql-tomcat/Dockerfile
+++ b/10/mysql-tomcat/Dockerfile
@@ -17,7 +17,7 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
# ---------------------------------------------------------------------------
-FROM tomcat:8-jre8
+FROM tomcat:8-jre8-slim
# ____ ____ ____ ____ _ __ _
# |_ _||_ _||_ _| |_ _|(_) [ | _ (_)
diff --git a/10/mysql-tomcat/xwiki/hibernate.cfg.xml b/10/mysql-tomcat/xwiki/hibernate.cfg.xml
index e2cc2be..880670a 100644
--- a/10/mysql-tomcat/xwiki/hibernate.cfg.xml
+++ b/10/mysql-tomcat/xwiki/hibernate.cfg.xml
@@ -27,7 +27,7 @@
<session-factory>
<!-- Please refer to the installation guide on
- https://platform.xwiki.org/xwiki/bin/view/AdminGuide/Installation for configuring your
+ https://www.xwiki.org/xwiki/bin/view/Documentation/AdminGuide/Installation/ for configuring your
database. You'll need to do 2 things:
1) Copy your database driver JAR in WEB-INF/lib or in some shared lib directory
2) Uncomment the properties below for your specific DB (and comment the default
diff --git a/10/postgres-tomcat/Dockerfile b/10/postgres-tomcat/Dockerfile
index 9eb81f5..4fedcaf 100644
--- a/10/postgres-tomcat/Dockerfile
+++ b/10/postgres-tomcat/Dockerfile
@@ -17,7 +17,7 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
# ---------------------------------------------------------------------------
-FROM tomcat:8-jre8
+FROM tomcat:8-jre8-slim
# ____ ____ ____ ____ _ __ _
# |_ _||_ _||_ _| |_ _|(_) [ | _ (_)
diff --git a/10/postgres-tomcat/xwiki/hibernate.cfg.xml b/10/postgres-tomcat/xwiki/hibernate.cfg.xml
index d050dfd..348d398 100644
--- a/10/postgres-tomcat/xwiki/hibernate.cfg.xml
+++ b/10/postgres-tomcat/xwiki/hibernate.cfg.xml
@@ -27,7 +27,7 @@
<session-factory>
<!-- Please refer to the installation guide on
- https://platform.xwiki.org/xwiki/bin/view/AdminGuide/Installation for configuring your
+ https://www.xwiki.org/xwiki/bin/view/Documentation/AdminGuide/Installation/ for configuring your
database. You'll need to do 2 things:
1) Copy your database driver JAR in WEB-INF/lib or in some shared lib directory
2) Uncomment the properties below for your specific DB (and comment the default
diff --git a/11/mysql-tomcat/Dockerfile b/11/mysql-tomcat/Dockerfile
index e8d69b9..a688e7d 100644
--- a/11/mysql-tomcat/Dockerfile
+++ b/11/mysql-tomcat/Dockerfile
@@ -17,7 +17,7 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
# ---------------------------------------------------------------------------
-FROM tomcat:8-jre8
+FROM tomcat:8-jre8-slim
# ____ ____ ____ ____ _ __ _
# |_ _||_ _||_ _| |_ _|(_) [ | _ (_)
diff --git a/11/mysql-tomcat/xwiki/hibernate.cfg.xml b/11/mysql-tomcat/xwiki/hibernate.cfg.xml
index 3dd16ad..2671c42 100644
--- a/11/mysql-tomcat/xwiki/hibernate.cfg.xml
+++ b/11/mysql-tomcat/xwiki/hibernate.cfg.xml
@@ -27,7 +27,7 @@
<session-factory>
<!-- Please refer to the installation guide on
- https://platform.xwiki.org/xwiki/bin/view/AdminGuide/Installation for configuring your
+ https://www.xwiki.org/xwiki/bin/view/Documentation/AdminGuide/Installation/ for configuring your
database. You'll need to do 2 things:
1) Copy your database driver JAR in WEB-INF/lib or in some shared lib directory
2) Uncomment the properties below for your specific DB (and comment the default
diff --git a/11/postgres-tomcat/Dockerfile b/11/postgres-tomcat/Dockerfile
index c13e4f2..e1ac27c 100644
--- a/11/postgres-tomcat/Dockerfile
+++ b/11/postgres-tomcat/Dockerfile
@@ -17,7 +17,7 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
# ---------------------------------------------------------------------------
-FROM tomcat:8-jre8
+FROM tomcat:8-jre8-slim
# ____ ____ ____ ____ _ __ _
# |_ _||_ _||_ _| |_ _|(_) [ | _ (_)
diff --git a/11/postgres-tomcat/xwiki/hibernate.cfg.xml b/11/postgres-tomcat/xwiki/hibernate.cfg.xml
index c77c8ba..e891563 100644
--- a/11/postgres-tomcat/xwiki/hibernate.cfg.xml
+++ b/11/postgres-tomcat/xwiki/hibernate.cfg.xml
@@ -27,7 +27,7 @@
<session-factory>
<!-- Please refer to the installation guide on
- https://platform.xwiki.org/xwiki/bin/view/AdminGuide/Installation for configuring your
+ https://www.xwiki.org/xwiki/bin/view/Documentation/AdminGuide/Installation/ for configuring your
database. You'll need to do 2 things:
1) Copy your database driver JAR in WEB-INF/lib or in some shared lib directory
2) Uncomment the properties below for your specific DB (and comment the default
diff --git a/template/Dockerfile b/template/Dockerfile
index 74b1177..e1f38ab 100644
--- a/template/Dockerfile
+++ b/template/Dockerfile
@@ -17,7 +17,7 @@
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
# 02110-1301 USA, or see the FSF site: http://www.fsf.org.
# ---------------------------------------------------------------------------
-FROM tomcat:8-jre8
+FROM tomcat:8-jre8-slim
# ____ ____ ____ ____ _ __ _
# |_ _||_ _||_ _| |_ _|(_) [ | _ (_)
--
GitLab