diff --git a/docker/clear.sh b/docker/clear.sh deleted file mode 100755 index 53bac83..0000000 --- a/docker/clear.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -docker-compose rm -fsv diff --git a/docker/compose.yml b/docker/compose.yml index 3dbdeb5..ff33f48 100644 --- a/docker/compose.yml +++ b/docker/compose.yml @@ -2,30 +2,21 @@ version: '3' services: pairgoth: container_name: pairgoth-engine - image: maven:3.6.3-openjdk-11-slim + image: eclipse-temurin:18-jdk working_dir: /home/app/pairgoth user: "${APP_UID}:${APP_GID}" entrypoint: bash -c - command: '"mvn -e -Duser.home=/home/app clean package && java -jar application/target/pairgoth-engine.war"' + command: '"java -jar pairgoth-engine.jar"' volumes: - - ..:/home/app/pairgoth + - ./data/app:/home/app/pairgoth - ./data/jetty:/var/lib/pairgoth/jetty - - ./data/maven:/home/app/.m2 networks: - pairgoth-network ports: - - '5006:5006' - '8080:8080' environment: HOME: "/home/app" USER: "app" - MAVEN_CONFIG: "/home/app/.m2" - MAVEN_OPTS: "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=*:5006" - SMTP_HOST: ${SMTP_HOST} - SMTP_PORT: ${SMTP_PORT} - SMTP_USER: ${SMTP_USER} - SMTP_PASSWORD: ${SMTP_PASSWORD} - # restart: unless-stopped stdin_open: true tty: true networks: diff --git a/docker/run.sh b/docker/run.sh index c5a3156..db0f017 100755 --- a/docker/run.sh +++ b/docker/run.sh @@ -1,16 +1,5 @@ #!/bin/bash -if ! test -f ../pairgoth.properties -then - echo "Missing pairgoth.properties file" >&2 - exit 1 -fi - -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\.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 - -mkdir -p data/jetty data/maven +mkdir -p data/jetty APP_UID=$(id -u) APP_GID=$(id -g) docker compose up