Merge branch 'docker' of https://gitbox.apache.org/repos/asf/turbine-archetypes into docker
diff --git a/pom.xml b/pom.xml
index 6a6a310..0034074 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,8 +46,9 @@
<docker>false</docker>
<app_volume_local_repo>not_used</app_volume_local_repo>
</properties>
-
- <build>
+
+ <build>
+
<extensions>
<extension>
<groupId>org.apache.maven.archetype</groupId>
diff --git a/src/main/resources/archetype-resources/docker-resources/db/Dockerfile b/src/main/resources/archetype-resources/docker-resources/db/Dockerfile
index c60ad3a..8e715aa 100644
--- a/src/main/resources/archetype-resources/docker-resources/db/Dockerfile
+++ b/src/main/resources/archetype-resources/docker-resources/db/Dockerfile
@@ -56,7 +56,7 @@
# it has been declared, those changes will be discarded.
RUN ["/usr/local/bin/docker-entrypoint.sh", "mysqld", "--datadir", "/initialized-db"]
-#RUN /docker-entrypoint.sh mysqld --datadir=/initialized-db && sleep 10
+
FROM mysql:8.0.19
diff --git a/src/main/resources/archetype-resources/docker-resources/docker-compose.yml b/src/main/resources/archetype-resources/docker-resources/docker-compose.yml
index 15bf8a2..bdf0f0c 100644
--- a/src/main/resources/archetype-resources/docker-resources/docker-compose.yml
+++ b/src/main/resources/archetype-resources/docker-resources/docker-compose.yml
@@ -69,14 +69,9 @@
# host: port
- "13306:3306"
- #networks:
- # - db
- #command: [mysqld, --character-set-server=utf8mb4, --collation-server=utf8mb4_unicode_ci]
command: --default-authentication-plugin=mysql_native_password
volumes:
#db_data:
mysql_log:
-
-#networks:
-# db:
+
diff --git a/src/main/resources/archetype-resources/docker-resources/readme.md b/src/main/resources/archetype-resources/docker-resources/readme.md
index 7071877..f9c17b5 100644
--- a/src/main/resources/archetype-resources/docker-resources/readme.md
+++ b/src/main/resources/archetype-resources/docker-resources/readme.md
@@ -36,7 +36,7 @@
## Check Docker Compose file (optional)
-- Check services in docker-compose.yml (volumes). You might map your local maven repostory like this:
+- Check services in docker-compose.yml (volumes). You might map your local maven repostory like this:
```sh
volumes:
@@ -45,6 +45,7 @@
```yml
- Check format:
+
```
docker-compose config
```
@@ -143,7 +144,6 @@
ls -la /myapp // should list pom.xml ...
```
-
### Build Services
The app service uses later a volume, which maps to the local maven repository, which you may need/not need.
@@ -168,6 +168,7 @@
to test it. CAVEAT: The db service is build and populated until now with hard coded data.
It is a dependency for the service app (see app/Dockerfile).
+
# System Specific Informations
## Windows
