mirror of
https://github.com/Sheldan/OnePlusBot.git
synced 2026-01-20 06:48:13 +00:00
Compare commits
9 Commits
oneplusbot
...
oneplusbot
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
95abffdc1f | ||
|
|
c430bbaf61 | ||
|
|
6f9dfb1087 | ||
|
|
1717954cb6 | ||
|
|
3c1facd1ab | ||
|
|
3237cf94bd | ||
|
|
0167d863bf | ||
|
|
42829faea7 | ||
|
|
7e52731247 |
7
.github/workflows/release.yml
vendored
7
.github/workflows/release.yml
vendored
@@ -16,11 +16,6 @@ jobs:
|
|||||||
- name: Load current version
|
- name: Load current version
|
||||||
id: version
|
id: version
|
||||||
run: echo "version=$(mvn -s settings.xml --file pom.xml -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive exec:exec)" >> $GITHUB_ENV
|
run: echo "version=$(mvn -s settings.xml --file pom.xml -q -Dexec.executable="echo" -Dexec.args='${project.version}' --non-recursive exec:exec)" >> $GITHUB_ENV
|
||||||
- name: Load abstracto version
|
|
||||||
id: abstracto_version
|
|
||||||
run: echo "abstracto_version=$(mvn help:evaluate -s settings.xml --file pom.xml -Dexpression=abstracto.version -q -DforceStdout)" >> $GITHUB_ENV
|
|
||||||
env:
|
|
||||||
MAVEN_OPTS: -Dorg.slf4j.simpleLogger.defaultLogLevel=OFF
|
|
||||||
- name: Publish to GitHub Packages
|
- name: Publish to GitHub Packages
|
||||||
run: mvn -s settings.xml --file pom.xml -B deploy -Dmaven.wagon.http.pool=false -DskipTests=true
|
run: mvn -s settings.xml --file pom.xml -B deploy -Dmaven.wagon.http.pool=false -DskipTests=true
|
||||||
env:
|
env:
|
||||||
@@ -39,5 +34,5 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
REGISTRY_PREFIX: docker.pkg.github.com/sheldan/oneplusbot/
|
REGISTRY_PREFIX: docker.pkg.github.com/sheldan/oneplusbot/
|
||||||
VERSION: ${{ env.version }}
|
VERSION: ${{ env.version }}
|
||||||
ABSTRACTO_VERSION: ${{ env.abstracto_version }}
|
ABSTRACTO_VERSION: 1.2
|
||||||
ABSTRACTO_REGISTRY_PREFIX: docker.pkg.github.com/sheldan/abstracto/
|
ABSTRACTO_REGISTRY_PREFIX: docker.pkg.github.com/sheldan/abstracto/
|
||||||
@@ -3,7 +3,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>dev.sheldan.oneplus.bot.application</groupId>
|
<groupId>dev.sheldan.oneplus.bot.application</groupId>
|
||||||
<artifactId>application</artifactId>
|
<artifactId>application</artifactId>
|
||||||
<version>1.3-SNAPSHOT</version>
|
<version>1.3.2</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<artifactId>executable</artifactId>
|
<artifactId>executable</artifactId>
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>dev.sheldan.oneplus.bot.application</groupId>
|
<groupId>dev.sheldan.oneplus.bot.application</groupId>
|
||||||
<artifactId>application</artifactId>
|
<artifactId>application</artifactId>
|
||||||
<version>1.3-SNAPSHOT</version>
|
<version>1.3.2</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>dev.sheldan.oneplus.bot.application.custom</groupId>
|
<groupId>dev.sheldan.oneplus.bot.application.custom</groupId>
|
||||||
<artifactId>oneplus-bot-customizations</artifactId>
|
<artifactId>oneplus-bot-customizations</artifactId>
|
||||||
<version>1.3-SNAPSHOT</version>
|
<version>1.3.2</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -5,13 +5,13 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>dev.sheldan.oneplus.bot</groupId>
|
<groupId>dev.sheldan.oneplus.bot</groupId>
|
||||||
<artifactId>oneplusbot</artifactId>
|
<artifactId>oneplusbot</artifactId>
|
||||||
<version>1.3-SNAPSHOT</version>
|
<version>1.3.2</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<groupId>dev.sheldan.oneplus.bot.application</groupId>
|
<groupId>dev.sheldan.oneplus.bot.application</groupId>
|
||||||
<artifactId>application</artifactId>
|
<artifactId>application</artifactId>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<version>1.3-SNAPSHOT</version>
|
<version>1.3.2</version>
|
||||||
<modules>
|
<modules>
|
||||||
<module>executable</module>
|
<module>executable</module>
|
||||||
<module>oneplus-bot-customizations</module>
|
<module>oneplus-bot-customizations</module>
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>dev.sheldan.oneplus.bot.deployment</groupId>
|
<groupId>dev.sheldan.oneplus.bot.deployment</groupId>
|
||||||
<artifactId>deployment</artifactId>
|
<artifactId>deployment</artifactId>
|
||||||
<version>1.3-SNAPSHOT</version>
|
<version>1.3.2</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -56,6 +56,9 @@ services:
|
|||||||
- "${TOMCAT_PORT}:8080"
|
- "${TOMCAT_PORT}:8080"
|
||||||
networks:
|
networks:
|
||||||
- oneplusbot
|
- oneplusbot
|
||||||
|
volumes:
|
||||||
|
- bot-logs:/logs
|
||||||
|
- ./config:/config
|
||||||
pgadmin:
|
pgadmin:
|
||||||
container_name: pgadmin
|
container_name: pgadmin
|
||||||
image: ${REGISTRY_PREFIX}oneplus_bot_pg_admin
|
image: ${REGISTRY_PREFIX}oneplus_bot_pg_admin
|
||||||
@@ -81,6 +84,7 @@ services:
|
|||||||
- oneplusbot
|
- oneplusbot
|
||||||
volumes:
|
volumes:
|
||||||
- ./res/prometheus-scrapper-password-filled:/etc/prometheus/micrometer_password
|
- ./res/prometheus-scrapper-password-filled:/etc/prometheus/micrometer_password
|
||||||
|
- prometheus-data:/prometheus
|
||||||
grafana:
|
grafana:
|
||||||
container_name: grafana
|
container_name: grafana
|
||||||
image: ${REGISTRY_PREFIX}oneplus_bot_grafana
|
image: ${REGISTRY_PREFIX}oneplus_bot_grafana
|
||||||
@@ -103,3 +107,5 @@ networks:
|
|||||||
volumes:
|
volumes:
|
||||||
db-data:
|
db-data:
|
||||||
grafana-user-data:
|
grafana-user-data:
|
||||||
|
prometheus-data:
|
||||||
|
bot-logs:
|
||||||
@@ -3,7 +3,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>dev.sheldan.oneplus.bot.deployment</groupId>
|
<groupId>dev.sheldan.oneplus.bot.deployment</groupId>
|
||||||
<artifactId>deployment</artifactId>
|
<artifactId>deployment</artifactId>
|
||||||
<version>1.3-SNAPSHOT</version>
|
<version>1.3.2</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -3,6 +3,8 @@ MAINTAINER Sheldan
|
|||||||
VOLUME /tmp
|
VOLUME /tmp
|
||||||
ADD bot/app.jar /app.jar
|
ADD bot/app.jar /app.jar
|
||||||
ADD config/* /config/
|
ADD config/* /config/
|
||||||
|
VOLUME ["/config"]
|
||||||
|
VOLUME ["/logs"]
|
||||||
ADD wrapper/*.sh /
|
ADD wrapper/*.sh /
|
||||||
RUN chmod +x /start.sh
|
RUN chmod +x /start.sh
|
||||||
CMD ["/start.sh"]
|
CMD ["/start.sh"]
|
||||||
@@ -3,7 +3,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<artifactId>oneplusbot</artifactId>
|
<artifactId>oneplusbot</artifactId>
|
||||||
<groupId>dev.sheldan.oneplus.bot</groupId>
|
<groupId>dev.sheldan.oneplus.bot</groupId>
|
||||||
<version>1.3-SNAPSHOT</version>
|
<version>1.3.2</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
8
pom.xml
8
pom.xml
@@ -12,13 +12,13 @@
|
|||||||
|
|
||||||
<groupId>dev.sheldan.oneplus.bot</groupId>
|
<groupId>dev.sheldan.oneplus.bot</groupId>
|
||||||
<artifactId>oneplusbot</artifactId>
|
<artifactId>oneplusbot</artifactId>
|
||||||
<version>1.3-SNAPSHOT</version>
|
<version>1.3.2</version>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<maven.compiler.target>1.8</maven.compiler.target>
|
<maven.compiler.target>1.8</maven.compiler.target>
|
||||||
<maven.compiler.source>1.8</maven.compiler.source>
|
<maven.compiler.source>1.8</maven.compiler.source>
|
||||||
<abstracto.version>1.2</abstracto.version>
|
<abstracto.version>1.2.2</abstracto.version>
|
||||||
<abstracto.templates.version>1.2</abstracto.templates.version>
|
<abstracto.templates.version>1.2.1</abstracto.templates.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
@@ -54,7 +54,7 @@
|
|||||||
<scm>
|
<scm>
|
||||||
<url>https://maven.pkg.github.com/Sheldan/OnePlusBot</url>
|
<url>https://maven.pkg.github.com/Sheldan/OnePlusBot</url>
|
||||||
<developerConnection>scm:git:git@github.com:Sheldan/OnePlusBot.git</developerConnection>
|
<developerConnection>scm:git:git@github.com:Sheldan/OnePlusBot.git</developerConnection>
|
||||||
<tag>HEAD</tag>
|
<tag>oneplusbot-1.3.2</tag>
|
||||||
</scm>
|
</scm>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
@@ -3,14 +3,14 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>dev.sheldan.oneplus.bot.templates</groupId>
|
<groupId>dev.sheldan.oneplus.bot.templates</groupId>
|
||||||
<artifactId>templates</artifactId>
|
<artifactId>templates</artifactId>
|
||||||
<version>1.3-SNAPSHOT</version>
|
<version>1.3.2</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
|
<groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
|
||||||
<artifactId>oneplus-bot-modules</artifactId>
|
<artifactId>oneplus-bot-modules</artifactId>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<version>1.3-SNAPSHOT</version>
|
<version>1.3.2</version>
|
||||||
<modules>
|
<modules>
|
||||||
<module>starboard-custom</module>
|
<module>starboard-custom</module>
|
||||||
</modules>
|
</modules>
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
|
<groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
|
||||||
<artifactId>oneplus-bot-modules</artifactId>
|
<artifactId>oneplus-bot-modules</artifactId>
|
||||||
<version>1.3-SNAPSHOT</version>
|
<version>1.3.2</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>dev.sheldan.oneplus.bot</groupId>
|
<groupId>dev.sheldan.oneplus.bot</groupId>
|
||||||
<artifactId>oneplusbot</artifactId>
|
<artifactId>oneplusbot</artifactId>
|
||||||
<version>1.3-SNAPSHOT</version>
|
<version>1.3.2</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
@@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
<groupId>dev.sheldan.oneplus.bot.templates</groupId>
|
<groupId>dev.sheldan.oneplus.bot.templates</groupId>
|
||||||
<artifactId>templates</artifactId>
|
<artifactId>templates</artifactId>
|
||||||
<version>1.3-SNAPSHOT</version>
|
<version>1.3.2</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
@@ -3,7 +3,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>dev.sheldan.oneplus.bot.templates</groupId>
|
<groupId>dev.sheldan.oneplus.bot.templates</groupId>
|
||||||
<artifactId>templates</artifactId>
|
<artifactId>templates</artifactId>
|
||||||
<version>1.3-SNAPSHOT</version>
|
<version>1.3.2</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>dev.sheldan.oneplus.bot.templates.translations</groupId>
|
<groupId>dev.sheldan.oneplus.bot.templates.translations</groupId>
|
||||||
<artifactId>translations</artifactId>
|
<artifactId>translations</artifactId>
|
||||||
<version>1.3-SNAPSHOT</version>
|
<version>1.3.2</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user