From 93f41f66cbc17d7c0400009430ea3e3a4434528f Mon Sep 17 00:00:00 2001
From: Julien Dubois <julien.dubois@gmail.com>
Date: Mon, 4 Mar 2019 17:21:31 +0100
Subject: [PATCH] Remove Oracle Docker image

Fix #9370
---
 generators/generator-base-docker.js           |  1 -
 generators/generator-constants.js             |  2 --
 generators/server/files.js                    |  2 +-
 generators/server/index.js                    |  1 -
 .../templates/src/main/docker/oracle.yml.ejs  | 30 -------------------
 5 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 generators/server/templates/src/main/docker/oracle.yml.ejs

diff --git a/generators/generator-base-docker.js b/generators/generator-base-docker.js
index ad50b8d69534..dae6f4066ea8 100644
--- a/generators/generator-base-docker.js
+++ b/generators/generator-base-docker.js
@@ -77,7 +77,6 @@ module.exports = class extends BaseGenerator {
                 this.DOCKER_MYSQL = constants.DOCKER_MYSQL;
                 this.DOCKER_MARIADB = constants.DOCKER_MARIADB;
                 this.DOCKER_POSTGRESQL = constants.DOCKER_POSTGRESQL;
-                this.DOCKER_ORACLE = constants.DOCKER_ORACLE;
                 this.DOCKER_MONGODB = constants.DOCKER_MONGODB;
                 this.DOCKER_COUCHBASE = constants.DOCKER_COUCHBASE;
                 this.DOCKER_MEMCACHED = constants.DOCKER_MEMCACHED;
diff --git a/generators/generator-constants.js b/generators/generator-constants.js
index 3fdad0fba483..e32a0ce4c54b 100644
--- a/generators/generator-constants.js
+++ b/generators/generator-constants.js
@@ -27,7 +27,6 @@ const DOCKER_MONGODB = 'mongo:4.0.6';
 const DOCKER_COUCHBASE = 'couchbase/server:6.0.1';
 const DOCKER_CASSANDRA = 'cassandra:3.11.4';
 const DOCKER_MSSQL = 'microsoft/mssql-server-linux:latest';
-const DOCKER_ORACLE = 'sath89/oracle-12c:latest';
 const DOCKER_HAZELCAST_MANAGEMENT_CENTER = 'hazelcast/management-center:3.11.3';
 const DOCKER_MEMCACHED = 'memcached:1.5.12-alpine';
 const DOCKER_KEYCLOAK = 'jboss/keycloak:4.8.3.Final';
@@ -252,7 +251,6 @@ const constants = {
     DOCKER_COUCHBASE,
     DOCKER_CASSANDRA,
     DOCKER_MSSQL,
-    DOCKER_ORACLE,
     DOCKER_HAZELCAST_MANAGEMENT_CENTER,
     DOCKER_MEMCACHED,
     DOCKER_ELASTICSEARCH,
diff --git a/generators/server/files.js b/generators/server/files.js
index cac6ceaf3e72..26341eb5b20a 100644
--- a/generators/server/files.js
+++ b/generators/server/files.js
@@ -54,7 +54,7 @@ const serverFiles = {
             templates: ['Dockerfile', 'entrypoint.sh', '.dockerignore', 'app.yml', 'sonar.yml']
         },
         {
-            condition: generator => generator.prodDatabaseType !== 'no',
+            condition: generator => generator.prodDatabaseType !== 'no' && generator.prodDatabaseType !== 'oracle',
             path: DOCKER_DIR,
             templates: [{ file: generator => `${generator.prodDatabaseType}.yml` }]
         },
diff --git a/generators/server/index.js b/generators/server/index.js
index 387d5db3af85..673c7396705a 100644
--- a/generators/server/index.js
+++ b/generators/server/index.js
@@ -105,7 +105,6 @@ module.exports = class extends BaseBlueprintGenerator {
                 this.DOCKER_MONGODB = constants.DOCKER_MONGODB;
                 this.DOCKER_COUCHBASE = constants.DOCKER_COUCHBASE;
                 this.DOCKER_MSSQL = constants.DOCKER_MSSQL;
-                this.DOCKER_ORACLE = constants.DOCKER_ORACLE;
                 this.DOCKER_HAZELCAST_MANAGEMENT_CENTER = constants.DOCKER_HAZELCAST_MANAGEMENT_CENTER;
                 this.DOCKER_MEMCACHED = constants.DOCKER_MEMCACHED;
                 this.DOCKER_CASSANDRA = constants.DOCKER_CASSANDRA;
diff --git a/generators/server/templates/src/main/docker/oracle.yml.ejs b/generators/server/templates/src/main/docker/oracle.yml.ejs
deleted file mode 100644
index cc6d117a3df8..000000000000
--- a/generators/server/templates/src/main/docker/oracle.yml.ejs
+++ /dev/null
@@ -1,30 +0,0 @@
-<%#
- Copyright 2013-2019 the original author or authors from the JHipster project.
-
- This file is part of the JHipster project, see https://www.jhipster.tech/
- for more information.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--%>
-version: '2'
-services:
-    <%= baseName.toLowerCase() %>-oracle:
-        image: <%= DOCKER_ORACLE %>
-        # volumes:
-        #     - ~/volumes/jhipster/<%= baseName %>/oracle/data:/u01/app/oracle
-        environment:
-            - DBCA_TOTAL_MEMORY=1024
-            - WEB_CONSOLE=true
-        ports:
-            - 1580:8080
-            - 1521:1521