Remove Oracle Docker image

Fix #9370
jhipster · Mar 4, 2019 · 93f41f6 · 93f41f6
1 parent 91f72b8
commit 93f41f6
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 35 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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