From d50d4c012acbf6a084c45a131182069aed172cf3 Mon Sep 17 00:00:00 2001
From: Minh Tran <mtran@atlassian.com>
Date: Thu, 8 Nov 2018 14:52:58 +1100
Subject: [PATCH] CONFSRVDEV-8918 - Switching the base image from Alpine Linux
 to Ubuntu

---
 Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d7f1a15..c2a99f3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM adoptopenjdk/openjdk8:jdk8u192-b12-alpine
+FROM adoptopenjdk/openjdk8:x86_64-ubuntu-jdk8u192-b12
 MAINTAINER Atlassian Confluence
 
 ENV RUN_USER            daemon
@@ -19,7 +19,8 @@ WORKDIR $CONFLUENCE_HOME
 CMD ["/entrypoint.sh", "-fg"]
 ENTRYPOINT ["/sbin/tini", "--"]
 
-RUN apk add --no-cache wget curl bash procps perl ttf-dejavu tini
+RUN apt-get update && apt-get install -y wget curl bash procps perl fontconfig && apt-get clean -y && apt-get autoremove -y
+RUN wget https://github.com/krallin/tini/releases/download/v0.18.0/tini -O /sbin/tini && chmod a+x /sbin/tini
 
 COPY entrypoint.sh              /entrypoint.sh