Fix docker packaging after last reng
This commit is contained in:
@@ -6,10 +6,8 @@ services:
|
|||||||
working_dir: /home/app/pairgoth
|
working_dir: /home/app/pairgoth
|
||||||
user: "${APP_UID}:${APP_GID}"
|
user: "${APP_UID}:${APP_GID}"
|
||||||
entrypoint: bash -c
|
entrypoint: bash -c
|
||||||
command: '"mvn -e -Duser.home=/home/app clean package jetty:run"'
|
command: '"mvn -e -Duser.home=/home/app clean package && java -jar application/target/pairgoth-engine.war"'
|
||||||
# command: mvn -X -e -Pdev clean verify -Dit.test=ApiTokenIT#test01NoVersionHeader -Dorg.slf4j.simpleLogger.log.level=trace jetty:run
|
|
||||||
volumes:
|
volumes:
|
||||||
- ./pairgoth.properties:/var/lib/pairgoth/pairgoth.properties
|
|
||||||
- ..:/home/app/pairgoth
|
- ..:/home/app/pairgoth
|
||||||
- ./data/jetty:/var/lib/pairgoth/jetty
|
- ./data/jetty:/var/lib/pairgoth/jetty
|
||||||
- ./data/maven:/home/app/.m2
|
- ./data/maven:/home/app/.m2
|
||||||
|
@@ -1,15 +0,0 @@
|
|||||||
# webapp
|
|
||||||
webapp.env = dev
|
|
||||||
webapp.url = http://localhost:8080
|
|
||||||
|
|
||||||
# smtp
|
|
||||||
smtp.sender =
|
|
||||||
smtp.host =
|
|
||||||
smtp.port = 587
|
|
||||||
smtp.user =
|
|
||||||
smtp.password =
|
|
||||||
|
|
||||||
# logging
|
|
||||||
logger.level = trace
|
|
||||||
logger.notification = false
|
|
||||||
# logger.notification = <level>:smtp:<smtp-host>:<smtp-port>:<from-address>:<to-address>
|
|
@@ -1,15 +1,15 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
if ! test -f pairgoth.properties
|
if ! test -f ../pairgoth.properties
|
||||||
then
|
then
|
||||||
echo "Missing pairgoth.properties file" >&2
|
echo "Missing pairgoth.properties file" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
grep -r '^smtp\.host' pairgoth.properties | sed -r -e 's/smtp\.host/SMTP_HOST/' -e 's/ //g' > .env
|
grep -r '^smtp\.host' ../pairgoth.properties | sed -r -e 's/smtp\.host/SMTP_HOST/' -e 's/ //g' > .env
|
||||||
grep -r '^smtp\.port' pairgoth.properties | sed -r -e 's/smtp\.port/SMTP_PORT/' -e 's/ //g' >> .env
|
grep -r '^smtp\.port' ../pairgoth.properties | sed -r -e 's/smtp\.port/SMTP_PORT/' -e 's/ //g' >> .env
|
||||||
grep -r '^smtp\.user' pairgoth.properties | sed -r -e 's/smtp\.user/SMTP_USER/' -e 's/ //g' >> .env
|
grep -r '^smtp\.user' ../pairgoth.properties | sed -r -e 's/smtp\.user/SMTP_USER/' -e 's/ //g' >> .env
|
||||||
grep -r '^smtp\.password' pairgoth.properties | sed -r -e 's/smtp\.password/SMTP_PASSWORD/' -e 's/ //g' >> .env
|
grep -r '^smtp\.password' ../pairgoth.properties | sed -r -e 's/smtp\.password/SMTP_PASSWORD/' -e 's/ //g' >> .env
|
||||||
|
|
||||||
mkdir -p data/jetty data/maven
|
mkdir -p data/jetty data/maven
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user