diff --git a/.idea/runConfigurations/ProtegoTotalumBotApp.xml b/.idea/runConfigurations/ProtegoTotalumBotApp.xml new file mode 100644 index 0000000..df50123 --- /dev/null +++ b/.idea/runConfigurations/ProtegoTotalumBotApp.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/assemble.xml b/.idea/runConfigurations/assemble.xml new file mode 100644 index 0000000..9e9bfd3 --- /dev/null +++ b/.idea/runConfigurations/assemble.xml @@ -0,0 +1,37 @@ + + + + + + + true + true + + + + + false + false + + + \ No newline at end of file diff --git a/.idea/runConfigurations/ktlintCheck.xml b/.idea/runConfigurations/ktlintCheck.xml new file mode 100644 index 0000000..ee7a8ec --- /dev/null +++ b/.idea/runConfigurations/ktlintCheck.xml @@ -0,0 +1,24 @@ + + + + + + + true + true + false + false + + + \ No newline at end of file diff --git a/.run/assemble.run.xml b/.run/assemble.run.xml deleted file mode 100644 index 3d8d7a3..0000000 --- a/.run/assemble.run.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - true - true - - - - - false - - - \ No newline at end of file diff --git a/docker/.env b/docker/.env index 5aed45c..17fa423 100644 --- a/docker/.env +++ b/docker/.env @@ -1 +1 @@ -COMPOSE_PROJECT_NAME = leo-bot \ No newline at end of file +COMPOSE_PROJECT_NAME = protego-totalum-bot \ No newline at end of file diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 0b162a3..4b7ee41 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,10 +1,3 @@ -version: "3.9" - -networks: - leo-network: - name: $APPLICATION_NAME-network - external: false - services: database: container_name: $APPLICATION_NAME-postgres @@ -18,8 +11,8 @@ services: POSTGRES_USER: $PG_USER POSTGRES_PASSWORD: $PG_PASSWORD networks: - - leo-network - leo-bot: + - protego-totalum-network + protego-totalum-bot: container_name: $APPLICATION_NAME-bot depends_on: - database @@ -29,11 +22,16 @@ services: ports: - "8080:8080" command: - - discord-leo-bot.jar + - protego-totalum-bot.jar environment: - LEO_DB_HOST: database - LEO_DB_PORT: 5432 + PROTEGO_TOTALUM_DB_HOST: database + PROTEGO_TOTALUM_DB_PORT: 5432 networks: - - leo-network + - protego-totalum-network env_file: - - ignore.env \ No newline at end of file + - ignore.env + +networks: + protego-totalum-network: + name: $APPLICATION_NAME-network + external: false \ No newline at end of file diff --git a/docker/env.bat b/docker/env.bat index fded3fa..c47d00a 100644 --- a/docker/env.bat +++ b/docker/env.bat @@ -1,6 +1,6 @@ -set APPLICATION_NAME=leo +set APPLICATION_NAME=protego-totalum -set PG_DBNAME=leo_db -set PG_USER=leo_login -set PG_PASSWORD=leo_password +set PG_DBNAME=protego_totalum +set PG_USER=protego_totalum +set PG_PASSWORD=protego_totalum set PG_PORT=5123 \ No newline at end of file diff --git a/docker/postgres/create_schemas.sql b/docker/postgres/create_schemas.sql index 39b0c1c..b1b558e 100644 --- a/docker/postgres/create_schemas.sql +++ b/docker/postgres/create_schemas.sql @@ -1,2 +1,3 @@ -\connect leo_db -create schema if not exists leo_bot_schema; \ No newline at end of file +\connect protego_totalum +create schema if not exists protego_totalum; +create schema if not exists liquibase; \ No newline at end of file diff --git a/pt-discord/Dockerfile b/pt-discord/Dockerfile index b5e5d55..c3de601 100644 --- a/pt-discord/Dockerfile +++ b/pt-discord/Dockerfile @@ -1,6 +1,7 @@ -FROM eclipse-temurin:21-jdk-alpine -MAINTAINER Vladislav Kuznetsov +FROM openjdk:21 +USER 65534 +LABEL org.opencontainers.image.authors="Vladislav Kuznetsov " VOLUME /tmp -ADD build/libs/pt-discord-2024.1.jar protego-totalum-bot.jar +ADD build/libs/pt-discord-0.0.1-SNAPSHOT.jar protego-totalum-bot.jar EXPOSE 8080 -ENTRYPOINT ["java", "-jar", "discord-leo-bot.jar"] \ No newline at end of file +ENTRYPOINT ["java", "-jar", "protego-totalum-bot.jar"] \ No newline at end of file