You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by gk...@apache.org on 2021/07/26 15:13:01 UTC
[turbine-archetypes] branch master updated (d0a8064 -> a142346)
This is an automated email from the ASF dual-hosted git repository.
gk pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-archetypes.git.
from d0a8064 Updating dependencies to get this to build again
add 018f6eb integrate merged and modified docker branch
add e55a118 update eclipse project, fix resource basedir in pom, dockerfile commands more concise, fix myapp location due to using now docker-resources / webapp in target folder, add metadata-complete (optional)
add 16887bf move data to src/main, adjusted arche-type-metadata.xml, updated jetty using profile only now, dynamic jetty-env template and conffiguring in pom.xml jettyEnvXml element
add d292503 added missing db resources, fixed pom merge, pass docker variable from archetype, add docker outputs, add scanIntervalSeconds
add f2a9ab9 db adjustments, fixes dynamic, skip resource scan, if calling jetty profile, update log4j, add more documentation
new a142346 fix configuration bugs in docker-compose, and maven plugin group maven settings
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.project | 6 +-
pom.xml | 52 ++++-
src/changes/changes.xml | 5 +
.../META-INF/maven/archetype-metadata.xml | 22 +-
.../archetype-resources/docs/DOCKER-README.md | 237 +++++++++++++++++++++
.../resources/archetype-resources/docs/README.md | 30 ++-
src/main/resources/archetype-resources/pom.xml | 188 ++++++++++------
.../data}/sample-mysql-data/_application-data.sql | 0
.../sample-mysql-data/_turbine-security-data.sql | 0
.../src/main/docker-resources/app/Dockerfile | 18 ++
.../src/main/docker-resources/app/settings.xml | 69 ++++++
.../src/main/docker-resources/db/Dockerfile | 61 ++++++
.../src/main/docker-resources/db/mysql/conf/my.cnf | 34 +++
.../db/mysql/init/data.sql} | 0
.../db/mysql/log/log.out} | 0
.../src/main/docker-resources/docker-compose.yml | 74 +++++++
.../src/main/webapp/WEB-INF/jetty-env.xml | 15 +-
.../src/main/webapp/WEB-INF/web.xml | 2 +-
.../src/test/resources/log4j.properties | 89 --------
.../src/test/resources/log4j.xml | 56 +++++
.../resources/projects/first/archetype.properties | 4 +-
21 files changed, 793 insertions(+), 169 deletions(-)
create mode 100644 src/main/resources/archetype-resources/docs/DOCKER-README.md
rename src/main/resources/archetype-resources/{docs => src/main/data}/sample-mysql-data/_application-data.sql (100%)
rename src/main/resources/archetype-resources/{docs => src/main/data}/sample-mysql-data/_turbine-security-data.sql (100%)
create mode 100644 src/main/resources/archetype-resources/src/main/docker-resources/app/Dockerfile
create mode 100644 src/main/resources/archetype-resources/src/main/docker-resources/app/settings.xml
create mode 100644 src/main/resources/archetype-resources/src/main/docker-resources/db/Dockerfile
create mode 100644 src/main/resources/archetype-resources/src/main/docker-resources/db/mysql/conf/my.cnf
copy src/main/resources/archetype-resources/src/main/{webapp/logs/KEEPME => docker-resources/db/mysql/init/data.sql} (100%)
copy src/main/resources/archetype-resources/src/main/{webapp/logs/KEEPME => docker-resources/db/mysql/log/log.out} (100%)
create mode 100644 src/main/resources/archetype-resources/src/main/docker-resources/docker-compose.yml
delete mode 100644 src/main/resources/archetype-resources/src/test/resources/log4j.properties
create mode 100644 src/main/resources/archetype-resources/src/test/resources/log4j.xml
[turbine-archetypes] 01/01: fix configuration bugs in
docker-compose, and maven plugin group maven settings
Posted by gk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/turbine-archetypes.git
commit a1423466ebff880e752263f998f0bda1b3cf1a20
Author: gemkall <ge...@fu-berlin.de>
AuthorDate: Mon Jul 26 17:07:23 2021 +0200
fix configuration bugs in docker-compose, and maven plugin group maven settings
---
.../resources/archetype-resources/docs/README.md | 2 +-
.../src/main/docker-resources/app/settings.xml | 2 +-
.../src/main/docker-resources/db/Dockerfile | 4 ---
.../src/main/docker-resources/docker-compose.yml | 31 +++++++++-------------
4 files changed, 15 insertions(+), 24 deletions(-)
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 @@ mvn archetype:generate \
#### 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 @@ RUN ["/bin/sed", "-i", "s/exec \"$@\"/echo \"not running $@\"/", "/usr/local/bin
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_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
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 @@ services:
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 @@ services:
volumes:
db_data_${turbine_database_name}:
- mysql_log_${turbine_database_name}:
#networks:
# db: