diff --git a/Dockerfile_jre b/Dockerfile_jre index b1588a007a752e4e433545dca0f433fa622c1b67..cb3c09ccbad4187c38f9ac0c85fa25d5d4e815ff 100644 --- a/Dockerfile_jre +++ b/Dockerfile_jre @@ -5,12 +5,12 @@ ARG APP_DIR=/BudgetMaster RUN mkdir -p $APP_DIR RUN mkdir -p /root/.Deadlocker/BudgetMaster -COPY build/2.9.2/BudgetMaster-v2.9.2.jar /BudgetMaster/BudgetMaster.jar -COPY src/main/resources/config/templates/settings-docker.properties /root/.Deadlocker/BudgetMaster/settings.properties +COPY BudgetMasterServer/build/2.10.0/BudgetMasterServer-v2.10.0.jar /BudgetMaster/BudgetMaster.jar +COPY BudgetMasterServer/src/main/resources/config/templates/settings-docker.properties /root/.Deadlocker/BudgetMaster/settings.properties RUN echo "server.port=9000" > ~/.Deadlocker/BudgetMaster/settings.properties EXPOSE 9000 ENV JAR_LOCATION=$APP_DIR/BudgetMaster.jar -CMD ["sh", "-c", "java -jar ${JAR_LOCATION}"] +CMD ["bash", "-c", "java -jar ${JAR_LOCATION}"] diff --git a/docker-compose-test-jar.yaml b/docker-compose-test-jar.yaml new file mode 100644 index 0000000000000000000000000000000000000000..e96e7e36ba1c89a4765b6138dada072f276cf68a --- /dev/null +++ b/docker-compose-test-jar.yaml @@ -0,0 +1,39 @@ +version: '3.3' +services: + budgetmaster: + image: deadlocker8/budgetmaster-test-jar:latest + restart: "no" + networks: + - netPostgres + - jenkins_dev + expose: + - "8080" + ports: + - "8080:8080" + environment: + TZ: Europe/Berlin + LANG: en_US.UTF-8 + LANGUAGE: en_US.UTF-8 + budgetmaster.database.type: postgresql + budgetmaster.database.hostname: postgres + budgetmaster.database.port: 5432 + budgetmaster.database.databaseName: budgetmaster + budgetmaster.database.username: budgetmaster + budgetmaster.database.password: budgetmaster + depends_on: + - postgres + postgres: + image: postgres:latest + restart: "no" + environment: + POSTGRES_DB: budgetmaster + POSTGRES_PASSWORD: budgetmaster + POSTGRES_USER: budgetmaster + networks: + - netPostgres +networks: + netPostgres: + driver: bridge + jenkins_dev: + external: + name: jenkins_dev \ No newline at end of file