Merge pull request #14477 from deepu105/container-fixes

Remove mysql root user setting
jhipster · Mar 27, 2021 · 554b48a · 554b48a
2 parents 73397d9 + 23b44cf
commit 554b48a
Show file tree

Hide file tree

Showing 13 changed files with 0 additions and 15 deletions.
diff --git a/generators/kubernetes/templates/db/mysql.yml.ejs b/generators/kubernetes/templates/db/mysql.yml.ejs
@@ -64,8 +64,6 @@ spec:
       - name: mysql
         image: <%= DOCKER_MYSQL %>
         env:
-        - name: MYSQL_USER
-          value: root
         - name: MYSQL_ALLOW_EMPTY_PASSWORD
           value: 'yes'
         - name: MYSQL_DATABASE

diff --git a/generators/server/templates/src/main/docker/app.yml.ejs b/generators/server/templates/src/main/docker/app.yml.ejs
@@ -105,7 +105,6 @@ services:
     # volumes:
     #   - ~/volumes/jhipster/<%= baseName %>/mysql/:/var/lib/mysql/
     environment:
-      - MYSQL_USER=root
       - MYSQL_ALLOW_EMPTY_PASSWORD=yes
       - MYSQL_DATABASE=<%= baseName.toLowerCase() %>
     # If you want to expose these ports outside your dev PC,
@@ -120,7 +119,6 @@ services:
     # volumes:
     #   - ~/volumes/jhipster/<%= baseName %>/mysql/:/var/lib/mysql/
     environment:
-      - MYSQL_USER=root
       - MYSQL_ALLOW_EMPTY_PASSWORD=yes
       - MYSQL_DATABASE=<%= baseName.toLowerCase() %>
     # If you want to expose these ports outside your dev PC,

diff --git a/generators/server/templates/src/main/docker/mariadb.yml.ejs b/generators/server/templates/src/main/docker/mariadb.yml.ejs
@@ -24,7 +24,6 @@ services:
     # volumes:
     #   - ~/volumes/jhipster/<%= baseName %>/mysql/:/var/lib/mysql/
     environment:
-      - MYSQL_USER=root
       - MYSQL_ALLOW_EMPTY_PASSWORD=yes
       - MYSQL_DATABASE=<%= baseName.toLowerCase() %>
     # If you want to expose these ports outside your dev PC,

diff --git a/test/templates/compose/01-gateway/src/main/docker/app.yml b/test/templates/compose/01-gateway/src/main/docker/app.yml
@@ -13,7 +13,6 @@ services:
         # volumes:
         #     - ~/volumes/jhipster/jhgate/mysql/:/var/lib/mysql/
         environment:
-            - MYSQL_USER=root
             - MYSQL_ALLOW_EMPTY_PASSWORD=yes
             - MYSQL_DATABASE=jhgate
         ports:

diff --git a/test/templates/compose/01-gateway/src/main/docker/mysql.yml b/test/templates/compose/01-gateway/src/main/docker/mysql.yml
@@ -5,7 +5,6 @@ services:
         # volumes:
         #     - ~/volumes/jhipster/jhgate/mysql/:/var/lib/mysql/
         environment:
-            - MYSQL_USER=root
             - MYSQL_ALLOW_EMPTY_PASSWORD=yes
             - MYSQL_DATABASE=jhgate
         ports:

diff --git a/test/templates/compose/02-mysql/src/main/docker/app.yml b/test/templates/compose/02-mysql/src/main/docker/app.yml
@@ -11,7 +11,6 @@ services:
         # volumes:
         #     - ~/volumes/jhipster/msmysql/mysql/:/var/lib/mysql/
         environment:
-            - MYSQL_USER=root
             - MYSQL_ALLOW_EMPTY_PASSWORD=yes
             - MYSQL_DATABASE=msmysql
         ports:

diff --git a/test/templates/compose/02-mysql/src/main/docker/mysql.yml b/test/templates/compose/02-mysql/src/main/docker/mysql.yml
@@ -5,7 +5,6 @@ services:
         # volumes:
         #     - ~/volumes/jhipster/msmysql/mysql/:/var/lib/mysql/
         environment:
-            - MYSQL_USER=root
             - MYSQL_ALLOW_EMPTY_PASSWORD=yes
             - MYSQL_DATABASE=msmysql
         ports:

diff --git a/test/templates/compose/07-mariadb/src/main/docker/app.yml b/test/templates/compose/07-mariadb/src/main/docker/app.yml
@@ -11,7 +11,6 @@ services:
         # volumes:
         #     - ~/volumes/jhipster/msmysql/mysql/:/var/lib/mysql/
         environment:
-            - MYSQL_USER=root
             - MYSQL_ALLOW_EMPTY_PASSWORD=yes
             - MYSQL_DATABASE=msmysql
         ports:

diff --git a/test/templates/compose/07-mariadb/src/main/docker/mariadb.yml b/test/templates/compose/07-mariadb/src/main/docker/mariadb.yml
@@ -5,7 +5,6 @@ services:
         # volumes:
         #     - ~/volumes/jhipster/msmysql/mysql/:/var/lib/mysql/
         environment:
-            - MYSQL_USER=root
             - MYSQL_ALLOW_EMPTY_PASSWORD=yes
             - MYSQL_DATABASE=msmysql
         ports:

diff --git a/test/templates/compose/08-monolith/src/main/docker/app.yml b/test/templates/compose/08-monolith/src/main/docker/app.yml
@@ -13,7 +13,6 @@ services:
         # volumes:
         #     - ~/volumes/jhipster/sampleMysql/mysql/:/var/lib/mysql/
         environment:
-            - MYSQL_USER=root
             - MYSQL_ALLOW_EMPTY_PASSWORD=yes
             - MYSQL_DATABASE=samplemysql
         ports:

diff --git a/test/templates/compose/08-monolith/src/main/docker/mysql.yml b/test/templates/compose/08-monolith/src/main/docker/mysql.yml
@@ -5,7 +5,6 @@ services:
         # volumes:
         #     - ~/volumes/jhipster/sampleMysql/mysql/:/var/lib/mysql/
         environment:
-            - MYSQL_USER=root
             - MYSQL_ALLOW_EMPTY_PASSWORD=yes
             - MYSQL_DATABASE=samplemysql
         ports:

diff --git a/test/templates/compose/09-kafka/src/main/docker/app.yml b/test/templates/compose/09-kafka/src/main/docker/app.yml
@@ -21,7 +21,6 @@ services:
         # volumes:
         #     - ~/volumes/jhipster/sampleKafka/mysql/:/var/lib/mysql/
         environment:
-            - MYSQL_USER=root
             - MYSQL_ALLOW_EMPTY_PASSWORD=yes
             - MYSQL_DATABASE=samplekafka
         ports:

diff --git a/test/templates/compose/09-kafka/src/main/docker/mysql.yml b/test/templates/compose/09-kafka/src/main/docker/mysql.yml
@@ -5,7 +5,6 @@ services:
         # volumes:
         #     - ~/volumes/jhipster/sampleKafka/mysql/:/var/lib/mysql/
         environment:
-            - MYSQL_USER=root
             - MYSQL_ALLOW_EMPTY_PASSWORD=yes
             - MYSQL_DATABASE=samplekafka
         ports: