Небольшой рефакторинг (#4).

HogwartsSchoolOfMagic · Jul 5, 2024 · 009a776 · 009a776
1 parent 383de11
commit 009a776
Show file tree

Hide file tree

Showing 9 changed files with 95 additions and 61 deletions.
diff --git a/.idea/runConfigurations/ProtegoTotalumBotApp.xml b/.idea/runConfigurations/ProtegoTotalumBotApp.xml
diff --git a/.idea/runConfigurations/assemble.xml b/.idea/runConfigurations/assemble.xml
diff --git a/.idea/runConfigurations/ktlintCheck.xml b/.idea/runConfigurations/ktlintCheck.xml
diff --git a/.run/assemble.run.xml b/.run/assemble.run.xml
diff --git a/docker/.env b/docker/.env
@@ -1 +1 @@
-COMPOSE_PROJECT_NAME = leo-bot
+COMPOSE_PROJECT_NAME = protego-totalum-bot
diff --git 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
+      - ignore.env
+
+networks:
+  protego-totalum-network:
+    name: $APPLICATION_NAME-network
+    external: false
diff --git 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
diff --git 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;
+\connect protego_totalum
+create schema if not exists protego_totalum;
+create schema if not exists liquibase;
diff --git a/pt-discord/Dockerfile b/pt-discord/Dockerfile
@@ -1,6 +1,7 @@
-FROM eclipse-temurin:21-jdk-alpine
-MAINTAINER Vladislav Kuznetsov <[email protected]>
+FROM openjdk:21
+USER 65534
+LABEL org.opencontainers.image.authors="Vladislav Kuznetsov <[email protected]>"
 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"]
+ENTRYPOINT ["java", "-jar", "protego-totalum-bot.jar"]