Compare commits

...

13 Commits

16 changed files with 30 additions and 21 deletions

View File

@@ -34,5 +34,5 @@ jobs:
env:
REGISTRY_PREFIX: docker.pkg.github.com/sheldan/oneplusbot/
VERSION: ${{ env.version }}
ABSTRACTO_VERSION: 1.2
ABSTRACTO_VERSION: 1.2.4
ABSTRACTO_REGISTRY_PREFIX: docker.pkg.github.com/sheldan/abstracto/

View File

@@ -3,7 +3,7 @@
<parent>
<groupId>dev.sheldan.oneplus.bot.application</groupId>
<artifactId>application</artifactId>
<version>1.3</version>
<version>1.3.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>executable</artifactId>

View File

@@ -3,7 +3,7 @@
<parent>
<groupId>dev.sheldan.oneplus.bot.application</groupId>
<artifactId>application</artifactId>
<version>1.3</version>
<version>1.3.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent>
<groupId>dev.sheldan.oneplus.bot.application.custom</groupId>
<artifactId>oneplus-bot-customizations</artifactId>
<version>1.3</version>
<version>1.3.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -5,13 +5,13 @@
<parent>
<groupId>dev.sheldan.oneplus.bot</groupId>
<artifactId>oneplusbot</artifactId>
<version>1.3</version>
<version>1.3.4</version>
</parent>
<groupId>dev.sheldan.oneplus.bot.application</groupId>
<artifactId>application</artifactId>
<packaging>pom</packaging>
<version>1.3</version>
<version>1.3.4</version>
<modules>
<module>executable</module>
<module>oneplus-bot-customizations</module>

View File

@@ -3,7 +3,7 @@
<parent>
<groupId>dev.sheldan.oneplus.bot.deployment</groupId>
<artifactId>deployment</artifactId>
<version>1.3</version>
<version>1.3.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -56,6 +56,9 @@ services:
- "${TOMCAT_PORT}:8080"
networks:
- oneplusbot
volumes:
- bot-logs:/logs
- ./config:/config
pgadmin:
container_name: pgadmin
image: ${REGISTRY_PREFIX}oneplus_bot_pg_admin
@@ -81,6 +84,7 @@ services:
- oneplusbot
volumes:
- ./res/prometheus-scrapper-password-filled:/etc/prometheus/micrometer_password
- prometheus-data:/prometheus
grafana:
container_name: grafana
image: ${REGISTRY_PREFIX}oneplus_bot_grafana
@@ -102,4 +106,6 @@ networks:
volumes:
db-data:
grafana-user-data:
grafana-user-data:
prometheus-data:
bot-logs:

View File

@@ -3,7 +3,7 @@
<parent>
<groupId>dev.sheldan.oneplus.bot.deployment</groupId>
<artifactId>deployment</artifactId>
<version>1.3</version>
<version>1.3.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -3,6 +3,8 @@ MAINTAINER Sheldan
VOLUME /tmp
ADD bot/app.jar /app.jar
ADD config/* /config/
VOLUME ["/config"]
VOLUME ["/logs"]
ADD wrapper/*.sh /
RUN chmod +x /start.sh
CMD ["/start.sh"]

View File

@@ -3,7 +3,7 @@
<parent>
<artifactId>oneplusbot</artifactId>
<groupId>dev.sheldan.oneplus.bot</groupId>
<version>1.3</version>
<version>1.3.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -12,13 +12,14 @@
<groupId>dev.sheldan.oneplus.bot</groupId>
<artifactId>oneplusbot</artifactId>
<version>1.3</version>
<version>1.3.4</version>
<properties>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<abstracto.version>1.2</abstracto.version>
<abstracto.templates.version>1.2</abstracto.templates.version>
<!-- edit in release.yml as well -->
<abstracto.version>1.2.4</abstracto.version>
<abstracto.templates.version>1.2.1</abstracto.templates.version>
</properties>
<modules>
@@ -54,7 +55,7 @@
<scm>
<url>https://maven.pkg.github.com/Sheldan/OnePlusBot</url>
<developerConnection>scm:git:git@github.com:Sheldan/OnePlusBot.git</developerConnection>
<tag>oneplusbot-1.3</tag>
<tag>oneplusbot-1.3.4</tag>
</scm>
</project>

View File

@@ -3,14 +3,14 @@
<parent>
<groupId>dev.sheldan.oneplus.bot.templates</groupId>
<artifactId>templates</artifactId>
<version>1.3</version>
<version>1.3.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
<artifactId>oneplus-bot-modules</artifactId>
<packaging>pom</packaging>
<version>1.3</version>
<version>1.3.4</version>
<modules>
<module>starboard-custom</module>
</modules>

View File

@@ -3,7 +3,7 @@
<parent>
<groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
<artifactId>oneplus-bot-modules</artifactId>
<version>1.3</version>
<version>1.3.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -4,7 +4,7 @@
<parent>
<groupId>dev.sheldan.oneplus.bot</groupId>
<artifactId>oneplusbot</artifactId>
<version>1.3</version>
<version>1.3.4</version>
</parent>
<modules>
@@ -14,7 +14,7 @@
<groupId>dev.sheldan.oneplus.bot.templates</groupId>
<artifactId>templates</artifactId>
<version>1.3</version>
<version>1.3.4</version>
<packaging>pom</packaging>
</project>

View File

@@ -3,7 +3,7 @@
<parent>
<groupId>dev.sheldan.oneplus.bot.templates</groupId>
<artifactId>templates</artifactId>
<version>1.3</version>
<version>1.3.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>

View File

@@ -3,7 +3,7 @@
<parent>
<groupId>dev.sheldan.oneplus.bot.templates.translations</groupId>
<artifactId>translations</artifactId>
<version>1.3</version>
<version>1.3.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>