From ecfab9f1d637ce1bd00b80550ad547fea74916a5 Mon Sep 17 00:00:00 2001
From: Sudharaka Palamakumbura <sudharakap@mun.ca>
Date: Wed, 29 Jul 2020 14:52:25 -0700
Subject: [PATCH] fix: replace apk with apt-get for bionic based docker images

Related to https://github.com/jhipster/jhipster-online/issues/205
---
 Dockerfile                 | 8 ++++----
 src/main/docker/Dockerfile | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7844f646..d8fe6cba 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM openjdk:8 as builder
+FROM adoptopenjdk:11-jdk-hotspot-bionic as builder
 ADD . /code/
 RUN \
     apt-get update && \
@@ -13,12 +13,12 @@ RUN \
     rm -Rf /code/ /root/.m2 /root/.cache /tmp/* /var/lib/apt/lists/* /var/tmp/*  && \
     mkdir /tmp/jhispter && mkdir /tmp/jhispter/applications
 
-FROM openjdk:8-jre-alpine
+FROM adoptopenjdk:11-jre-hotspot
 ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
     JHIPSTER_SLEEP=0 \
     JAVA_OPTS=""
-RUN apk update && \
-    apk add nodejs npm && \
+RUN apt-get update && \
+    apt-get install nodejs npm -y && \
     npm install -g generator-jhipster@6.9.0
 CMD echo "The application will start in ${JHIPSTER_SLEEP}s..." && \
     sleep ${JHIPSTER_SLEEP} && \
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
index 07565b85..c5ff3c01 100644
--- a/src/main/docker/Dockerfile
+++ b/src/main/docker/Dockerfile
@@ -1,11 +1,11 @@
-FROM openjdk:8-jre-alpine
+FROM adoptopenjdk:11-jre-hotspot
 
 ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
     JHIPSTER_SLEEP=0 \
     JAVA_OPTS=""
 
-RUN apk update && \
-    apk add nodejs-current yarn && \
+RUN apt-get update && \
+    apt-get install nodejs-current yarn -y && \
     yarn global add generator-jhipster@6.9.0
 
 CMD echo "The application will start in ${JHIPSTER_SLEEP}s..." && \