fix configuration bugs in docker-compose, and maven plugin group maven settings
diff --git a/src/main/resources/archetype-resources/docs/README.md b/src/main/resources/archetype-resources/docs/README.md
index 01217d3..6e7674b 100644
--- a/src/main/resources/archetype-resources/docs/README.md
+++ b/src/main/resources/archetype-resources/docs/README.md
@@ -69,7 +69,7 @@
#### Docker integration (short intro)
-N.B. Add
+N.B. Change dabase url to use service id and set docker environment to true:
-Dturbine_database_url=jdbc:mysql://db:3306/ \
-Ddocker=true
diff --git a/src/main/resources/archetype-resources/src/main/docker-resources/app/settings.xml b/src/main/resources/archetype-resources/src/main/docker-resources/app/settings.xml
index 87fe023..c7d36af 100644
--- a/src/main/resources/archetype-resources/src/main/docker-resources/app/settings.xml
+++ b/src/main/resources/archetype-resources/src/main/docker-resources/app/settings.xml
@@ -9,7 +9,7 @@
<usePluginRegistry>false</usePluginRegistry>
<offline>false</offline>
<pluginGroups>
- <pluginGroup>org.mortbay.jetty</pluginGroup>
+ <pluginGroup>org.eclipse.jetty</pluginGroup>
</pluginGroups>
<profiles>
<profile>
diff --git a/src/main/resources/archetype-resources/src/main/docker-resources/db/Dockerfile b/src/main/resources/archetype-resources/src/main/docker-resources/db/Dockerfile
index 932a800..7ccfc0f 100644
--- a/src/main/resources/archetype-resources/src/main/docker-resources/db/Dockerfile
+++ b/src/main/resources/archetype-resources/src/main/docker-resources/db/Dockerfile
@@ -14,10 +14,8 @@
ARG DB_CONTEXT
ARG MYSQL_DATABASE
ARG MYSQL_ROOT_PASSWORD
-ARG MYSQL_RANDOM_ROOT_PASSWORD
ARG MYSQL_USER
ARG MYSQL_PASSWORD
-ARG MYSQL_ONETIME_PASSWORD
# mount in docker-compose
ADD #var("DB_CONTEXT:-.")/mysql/conf/my.cnf /etc/
@@ -47,8 +45,6 @@
ENV MYSQL_USER=${MYSQL_USER}
ENV MYSQL_PASSWORD=${MYSQL_PASSWORD}
ENV MYSQL_HOST=
-ENV MYSQL_RANDOM_ROOT_PASSWORD ${MYSQL_RANDOM_ROOT_PASSWORD}
-ENV MYSQL_ONETIME_PASSWORD=${MYSQL_ONETIME_PASSWORD}
# Need to change the datadir to something else that /var/lib/mysql because the parent docker file defines it as a volume.
# https://docs.docker.com/engine/reference/builder/#volume :
diff --git a/src/main/resources/archetype-resources/src/main/docker-resources/docker-compose.yml b/src/main/resources/archetype-resources/src/main/docker-resources/docker-compose.yml
index 8d595a7..34b93ec 100644
--- a/src/main/resources/archetype-resources/src/main/docker-resources/docker-compose.yml
+++ b/src/main/resources/archetype-resources/src/main/docker-resources/docker-compose.yml
@@ -1,5 +1,5 @@
# service configuration for our dockerized Java app
-version: '3'
+version: '3.7'
services:
app:
@@ -37,29 +37,25 @@
context: ../
dockerfile: ./docker-resources/db/Dockerfile
args:
- - DB_CONTEXT=./docker-resources/db
- - MYSQL_DATABASE=${turbine_database_name}
- - MYSQL_ROOT_PASSWORD=changeit
- - MYSQL_RANDOM_ROOT_PASSWORD=
- - MYSQL_USER=${turbine_database_user}
- - MYSQL_PASSWORD=${turbine_database_password}
+ DB_CONTEXT: ./docker-resources/db
+ MYSQL_DATABASE: ${turbine_database_name}
+ MYSQL_ROOT_PASSWORD: changeit
+ MYSQL_USER: ${turbine_database_user}
+ MYSQL_PASSWORD: ${turbine_database_password}
environment:
- - MYSQL_DATABASE=${turbine_database_name}
- - MYSQL_HOST=
- - MYSQL_ROOT_PASSWORD=changeit
- - MYSQL_RANDOM_ROOT_PASSWORD=
- - MYSQL_USER=${turbine_database_user}
- - MYSQL_PASSWORD=${turbine_database_password}
- - DB_CONTEXT=./docker-resources/db
- #- MYSQL_ALLOW_EMPTY_PASSWORD=yes
+ MYSQL_DATABASE: ${turbine_database_name}
+ MYSQL_ROOT_PASSWORD: changeit
+ MYSQL_USER: ${turbine_database_user}
+ MYSQL_PASSWORD: ${turbine_database_password}
+ DB_CONTEXT: ./docker-resources/db
volumes:
- "./db/mysql/init:/docker-entrypoint-initdb.d"
- - "/db/mysql/conf:/etc/mysql/conf.d"
+ - "./db/mysql/conf:/etc/mysql/conf.d"
- "./db/mysql/data:/data"
+ - "./db/mysql/log:/mysql/log"
# default mysql persistent data
- - mysql_log_${turbine_database_name}:/mysql/log:rw
- db_data_${turbine_database_name}:/var/lib/mysql:rw
restart: always
ports:
@@ -73,7 +69,6 @@
volumes:
db_data_${turbine_database_name}:
- mysql_log_${turbine_database_name}:
#networks:
# db:
