mirror of
https://github.com/Sheldan/OnePlusBot.git
synced 2026-01-21 15:25:51 +00:00
Compare commits
38 Commits
oneplusbot
...
oneplusbot
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0bb14e0657 | ||
|
|
d71faa9749 | ||
|
|
e251b12dff | ||
|
|
4efb2470f8 | ||
|
|
77065f2374 | ||
|
|
0de0bdd64b | ||
|
|
e75322cda7 | ||
|
|
698d34c0e0 | ||
|
|
b3fafac81f | ||
|
|
8de5e543c8 | ||
|
|
eb620f5309 | ||
|
|
694e33da93 | ||
|
|
af27472b09 | ||
|
|
89c810c346 | ||
|
|
eb28bb6fd8 | ||
|
|
fad8abe2e3 | ||
|
|
d25f8dc12f | ||
|
|
9190688f45 | ||
|
|
b84177f062 | ||
|
|
6985f329f8 | ||
|
|
a815f7239e | ||
|
|
085e53cebc | ||
|
|
b7a67c8a38 | ||
|
|
95abffdc1f | ||
|
|
c430bbaf61 | ||
|
|
6f9dfb1087 | ||
|
|
1717954cb6 | ||
|
|
3c1facd1ab | ||
|
|
3237cf94bd | ||
|
|
0167d863bf | ||
|
|
42829faea7 | ||
|
|
7e52731247 | ||
|
|
38a03649bd | ||
|
|
54479ccfc6 | ||
|
|
de2fa4d581 | ||
|
|
6097773e75 | ||
|
|
6818e390be | ||
|
|
070893fe6a |
6
.github/workflows/release.yml
vendored
6
.github/workflows/release.yml
vendored
@@ -15,7 +15,7 @@ jobs:
|
|||||||
java-version: 1.8
|
java-version: 1.8
|
||||||
- name: Load current version
|
- name: Load current version
|
||||||
id: version
|
id: version
|
||||||
run: echo "version=$(mvn --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: 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:
|
||||||
@@ -33,4 +33,6 @@ jobs:
|
|||||||
run: docker-compose build && docker-compose push
|
run: docker-compose build && docker-compose push
|
||||||
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: 1.2.8
|
||||||
|
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.1</version>
|
<version>1.3.8</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<artifactId>executable</artifactId>
|
<artifactId>executable</artifactId>
|
||||||
@@ -80,6 +80,16 @@
|
|||||||
<artifactId>link-embed-impl</artifactId>
|
<artifactId>link-embed-impl</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>dev.sheldan.abstracto.modules</groupId>
|
||||||
|
<artifactId>webservices-impl</artifactId>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>dev.sheldan.abstracto.modules</groupId>
|
||||||
|
<artifactId>remind-impl</artifactId>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>dev.sheldan.abstracto.modules</groupId>
|
<groupId>dev.sheldan.abstracto.modules</groupId>
|
||||||
<artifactId>starboard-impl</artifactId>
|
<artifactId>starboard-impl</artifactId>
|
||||||
|
|||||||
@@ -16,4 +16,6 @@ log4j.logger.org.hibernate.type=trace
|
|||||||
management.metrics.tags.application=oneplus-bot
|
management.metrics.tags.application=oneplus-bot
|
||||||
spring.security.user.name=abstracto
|
spring.security.user.name=abstracto
|
||||||
spring.security.user.password=password
|
spring.security.user.password=password
|
||||||
spring.security.user.roles=USER
|
spring.security.user.roles=USER
|
||||||
|
|
||||||
|
spring.application.name=OnePlusBot
|
||||||
@@ -6,4 +6,6 @@ spring.quartz.jdbc.initialize-schema=never
|
|||||||
management.metrics.tags.application=oneplus-bot
|
management.metrics.tags.application=oneplus-bot
|
||||||
spring.security.user.name= ${REST_USER_NAME}
|
spring.security.user.name= ${REST_USER_NAME}
|
||||||
spring.security.user.password= ${REST_PASSWORD}
|
spring.security.user.password= ${REST_PASSWORD}
|
||||||
spring.security.user.roles=USER
|
spring.security.user.roles=USER
|
||||||
|
|
||||||
|
spring.application.name=OnePlusBot
|
||||||
@@ -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.1</version>
|
<version>1.3.8</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.1</version>
|
<version>1.3.8</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.1</version>
|
<version>1.3.8</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.1</version>
|
<version>1.3.8</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.1</version>
|
<version>1.3.8</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
@@ -24,4 +24,6 @@ PGADMIN_PORT=5050
|
|||||||
# default authentication for pg admin
|
# default authentication for pg admin
|
||||||
PGADMIN_DEFAULT_EMAIL=sheldan@sheldan.dev
|
PGADMIN_DEFAULT_EMAIL=sheldan@sheldan.dev
|
||||||
PGADMIN_DEFAULT_PASSWORD=admin
|
PGADMIN_DEFAULT_PASSWORD=admin
|
||||||
TOKEN=<INSERT TOKEN>
|
TOKEN=<INSERT TOKEN>
|
||||||
|
YOUTUBE_API_KEY=<INSERT KEY>
|
||||||
|
ONEPLUS_BOT_VERSION=1.3.8
|
||||||
@@ -2,21 +2,21 @@ version: '3.7'
|
|||||||
|
|
||||||
services:
|
services:
|
||||||
db:
|
db:
|
||||||
image: ${REGISTRY_PREFIX}oneplus_bot_database
|
image: ${REGISTRY_PREFIX}oneplus_bot_database:${ONEPLUS_BOT_VERSION}
|
||||||
container_name: database
|
container_name: database
|
||||||
restart: always
|
restart: always
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
|
POSTGRES_PASSWORD: ${DATABASE_PASSWORD}
|
||||||
POSTGRES_USER: ${DATABASE_USER}
|
POSTGRES_USER: ${DATABASE_USER}
|
||||||
ports:
|
ports:
|
||||||
- "${DATABASE_PORT}:5432"
|
- "127.0.0.1:${DATABASE_PORT}:5432"
|
||||||
networks:
|
networks:
|
||||||
- oneplusbot
|
- oneplusbot
|
||||||
volumes:
|
volumes:
|
||||||
- db-data:/var/lib/postgresql/data
|
- db-data:/var/lib/postgresql/data
|
||||||
deployment_container:
|
deployment_container:
|
||||||
container_name: deployment
|
container_name: deployment
|
||||||
image: ${REGISTRY_PREFIX}oneplus_bot_deployment
|
image: ${REGISTRY_PREFIX}oneplus_bot_deployment:${ONEPLUS_BOT_VERSION}
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
environment:
|
environment:
|
||||||
@@ -34,7 +34,7 @@ services:
|
|||||||
networks:
|
networks:
|
||||||
- oneplusbot
|
- oneplusbot
|
||||||
bot:
|
bot:
|
||||||
image: ${REGISTRY_PREFIX}oneplus_bot
|
image: ${REGISTRY_PREFIX}oneplus_bot:${ONEPLUS_BOT_VERSION}
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
- deployment_container
|
- deployment_container
|
||||||
@@ -50,45 +50,50 @@ services:
|
|||||||
DB_NAME: ${DATABASE_NAME}
|
DB_NAME: ${DATABASE_NAME}
|
||||||
REST_USER_NAME: ${REST_USER_NAME}
|
REST_USER_NAME: ${REST_USER_NAME}
|
||||||
REST_PASSWORD: ${REST_PASSWORD}
|
REST_PASSWORD: ${REST_PASSWORD}
|
||||||
|
YOUTUBE_API_KEY: ${YOUTUBE_API_KEY}
|
||||||
command: sh -c "while ping -c1 deployment_container &>/dev/null; do sleep 1; done; echo 'Liquibase finished!' && ./start.sh"
|
command: sh -c "while ping -c1 deployment_container &>/dev/null; do sleep 1; done; echo 'Liquibase finished!' && ./start.sh"
|
||||||
ports:
|
ports:
|
||||||
- "${DEBUG_PORT}:5005"
|
- "127.0.0.1:${DEBUG_PORT}:5005"
|
||||||
- "${TOMCAT_PORT}:8080"
|
- "127.0.0.1:${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:${ONEPLUS_BOT_VERSION}
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- db
|
||||||
environment:
|
environment:
|
||||||
PGADMIN_DEFAULT_EMAIL: ${PGADMIN_DEFAULT_EMAIL}
|
PGADMIN_DEFAULT_EMAIL: ${PGADMIN_DEFAULT_EMAIL}
|
||||||
PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_DEFAULT_PASSWORD}
|
PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_DEFAULT_PASSWORD}
|
||||||
ports:
|
ports:
|
||||||
- "${PGADMIN_PORT}:80"
|
- "127.0.0.1:${PGADMIN_PORT}:80"
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks:
|
networks:
|
||||||
- oneplusbot
|
- oneplusbot
|
||||||
prometheus:
|
prometheus:
|
||||||
container_name: prometheus
|
container_name: prometheus
|
||||||
image: ${REGISTRY_PREFIX}oneplus_bot_prometheus
|
image: ${REGISTRY_PREFIX}oneplus_bot_prometheus:${ONEPLUS_BOT_VERSION}
|
||||||
depends_on:
|
depends_on:
|
||||||
- bot
|
- bot
|
||||||
ports:
|
ports:
|
||||||
- "${PROMETHEUS_PORT}:9090"
|
- "127.0.0.1:${PROMETHEUS_PORT}:9090"
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
networks:
|
networks:
|
||||||
- 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:${ONEPLUS_BOT_VERSION}
|
||||||
depends_on:
|
depends_on:
|
||||||
- prometheus
|
- prometheus
|
||||||
- bot
|
- bot
|
||||||
ports:
|
ports:
|
||||||
- "${GRAFANA_PORT}:3000"
|
- "127.0.0.1:${GRAFANA_PORT}:3000"
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
volumes:
|
volumes:
|
||||||
- grafana-user-data:/var/lib/grafana
|
- grafana-user-data:/var/lib/grafana
|
||||||
@@ -102,4 +107,6 @@ 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.1</version>
|
<version>1.3.8</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
@@ -89,6 +89,26 @@
|
|||||||
<destFileName>utility.zip</destFileName>
|
<destFileName>utility.zip</destFileName>
|
||||||
</artifactItem>
|
</artifactItem>
|
||||||
|
|
||||||
|
f <artifactItem>
|
||||||
|
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
|
||||||
|
<artifactId>webservices</artifactId>
|
||||||
|
<version>${abstracto.templates.version}</version>
|
||||||
|
<type>zip</type>
|
||||||
|
<overWrite>true</overWrite>
|
||||||
|
<outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
|
||||||
|
<destFileName>webservices.zip</destFileName>
|
||||||
|
</artifactItem>
|
||||||
|
|
||||||
|
<artifactItem>
|
||||||
|
<groupId>dev.sheldan.abstracto-templates.templates</groupId>
|
||||||
|
<artifactId>remind</artifactId>
|
||||||
|
<version>${abstracto.templates.version}</version>
|
||||||
|
<type>zip</type>
|
||||||
|
<overWrite>true</overWrite>
|
||||||
|
<outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
|
||||||
|
<destFileName>remind.zip</destFileName>
|
||||||
|
</artifactItem>
|
||||||
|
|
||||||
<artifactItem>
|
<artifactItem>
|
||||||
<groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
|
<groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
|
||||||
<artifactId>starboard-custom-templates</artifactId>
|
<artifactId>starboard-custom-templates</artifactId>
|
||||||
@@ -145,6 +165,7 @@
|
|||||||
<outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
|
<outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
|
||||||
<destFileName>starboard.zip</destFileName>
|
<destFileName>starboard.zip</destFileName>
|
||||||
</artifactItem>
|
</artifactItem>
|
||||||
|
|
||||||
<artifactItem>
|
<artifactItem>
|
||||||
<groupId>dev.sheldan.abstracto-templates.translations</groupId>
|
<groupId>dev.sheldan.abstracto-templates.translations</groupId>
|
||||||
<artifactId>utility</artifactId>
|
<artifactId>utility</artifactId>
|
||||||
@@ -155,6 +176,26 @@
|
|||||||
<destFileName>utility.zip</destFileName>
|
<destFileName>utility.zip</destFileName>
|
||||||
</artifactItem>
|
</artifactItem>
|
||||||
|
|
||||||
|
<artifactItem>
|
||||||
|
<groupId>dev.sheldan.abstracto-templates.translations</groupId>
|
||||||
|
<artifactId>webservices</artifactId>
|
||||||
|
<version>${abstracto.templates.version}</version>
|
||||||
|
<type>zip</type>
|
||||||
|
<overWrite>true</overWrite>
|
||||||
|
<outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
|
||||||
|
<destFileName>webservices.zip</destFileName>
|
||||||
|
</artifactItem>
|
||||||
|
|
||||||
|
<artifactItem>
|
||||||
|
<groupId>dev.sheldan.abstracto-templates.translations</groupId>
|
||||||
|
<artifactId>remind</artifactId>
|
||||||
|
<version>${abstracto.templates.version}</version>
|
||||||
|
<type>zip</type>
|
||||||
|
<overWrite>true</overWrite>
|
||||||
|
<outputDirectory>${file.basedir}/deployment/translation-artifacts/</outputDirectory>
|
||||||
|
<destFileName>remind.zip</destFileName>
|
||||||
|
</artifactItem>
|
||||||
|
|
||||||
<artifactItem>
|
<artifactItem>
|
||||||
<groupId>dev.sheldan.oneplus.bot.templates.translations</groupId>
|
<groupId>dev.sheldan.oneplus.bot.templates.translations</groupId>
|
||||||
<artifactId>starboard-custom</artifactId>
|
<artifactId>starboard-custom</artifactId>
|
||||||
@@ -244,6 +285,28 @@
|
|||||||
<destFileName>utility.zip</destFileName>
|
<destFileName>utility.zip</destFileName>
|
||||||
</artifactItem>
|
</artifactItem>
|
||||||
|
|
||||||
|
<artifactItem>
|
||||||
|
<groupId>dev.sheldan.abstracto.modules</groupId>
|
||||||
|
<artifactId>webservices-impl</artifactId>
|
||||||
|
<version>${abstracto.version}</version>
|
||||||
|
<classifier>liquibase</classifier>
|
||||||
|
<type>zip</type>
|
||||||
|
<overWrite>true</overWrite>
|
||||||
|
<outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
|
||||||
|
<destFileName>webservices.zip</destFileName>
|
||||||
|
</artifactItem>
|
||||||
|
|
||||||
|
<artifactItem>
|
||||||
|
<groupId>dev.sheldan.abstracto.modules</groupId>
|
||||||
|
<artifactId>remind-impl</artifactId>
|
||||||
|
<version>${abstracto.version}</version>
|
||||||
|
<classifier>liquibase</classifier>
|
||||||
|
<type>zip</type>
|
||||||
|
<overWrite>true</overWrite>
|
||||||
|
<outputDirectory>${file.basedir}/deployment/liquibase-artifacts/</outputDirectory>
|
||||||
|
<destFileName>remind.zip</destFileName>
|
||||||
|
</artifactItem>
|
||||||
|
|
||||||
<artifactItem>
|
<artifactItem>
|
||||||
<groupId>dev.sheldan.oneplus.bot.application.custom</groupId>
|
<groupId>dev.sheldan.oneplus.bot.application.custom</groupId>
|
||||||
<artifactId>starboard-custom</artifactId>
|
<artifactId>starboard-custom</artifactId>
|
||||||
@@ -255,6 +318,17 @@
|
|||||||
<destFileName>starboard-custom.zip</destFileName>
|
<destFileName>starboard-custom.zip</destFileName>
|
||||||
</artifactItem>
|
</artifactItem>
|
||||||
|
|
||||||
|
<!-- overrides -->
|
||||||
|
<artifactItem>
|
||||||
|
<groupId>dev.sheldan.oneplus.bot.templates.overrides.templates</groupId>
|
||||||
|
<artifactId>webservices</artifactId>
|
||||||
|
<version>${project.version}</version>
|
||||||
|
<type>zip</type>
|
||||||
|
<overWrite>true</overWrite>
|
||||||
|
<outputDirectory>${file.basedir}/deployment/template-artifacts/</outputDirectory>
|
||||||
|
<destFileName>overrides-templates-webservices.zip</destFileName>
|
||||||
|
</artifactItem>
|
||||||
|
|
||||||
</artifactItems>
|
</artifactItems>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
FROM docker.pkg.github.com/sheldan/abstracto/abstracto_deployment:latest
|
ARG ABSTRACTO_REGISTRY_PREFIX
|
||||||
|
ARG ABSTRACTO_VERSION=latest
|
||||||
|
FROM ${ABSTRACTO_REGISTRY_PREFIX}abstracto_deployment:${ABSTRACTO_VERSION:-latest}
|
||||||
MAINTAINER Sheldan
|
MAINTAINER Sheldan
|
||||||
ADD template-artifacts /templates
|
ADD template-artifacts /templates
|
||||||
ADD translation-artifacts /translations
|
ADD translation-artifacts /translations
|
||||||
|
|||||||
@@ -1,13 +1,15 @@
|
|||||||
{
|
{
|
||||||
"template_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "starboard-custom"],
|
"template_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "webservices", "remind", "starboard-custom", "overrides-templates-webservices"],
|
||||||
"translation_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "starboard-custom"],
|
"translation_artifacts": ["utility", "core", "entertainment", "starboard", "link-embed", "webservices", "remind", "starboard-custom"],
|
||||||
"liquibase_artifacts": [
|
"liquibase_artifacts": [
|
||||||
{ "zip": "scheduling", "file": "scheduling-changeLog.xml" },
|
{ "zip": "scheduling", "file": "scheduling-changeLog.xml" },
|
||||||
{ "zip": "core", "file": "core-changeLog.xml" },
|
{ "zip": "core", "file": "core-changeLog.xml" },
|
||||||
{ "zip": "utility", "file": "utility-changeLog.xml"},
|
{ "zip": "utility", "file": "utility-changeLog.xml"},
|
||||||
{ "zip": "entertainment", "file": "entertainment-changeLog.xml"},
|
{ "zip": "entertainment", "file": "entertainment-changeLog.xml"},
|
||||||
{ "zip": "link-embed", "file": "link-embed-changeLog.xml"},
|
{ "zip": "link-embed", "file": "link-embed-changeLog.xml"},
|
||||||
|
{ "zip": "webservices", "file": "webservices-changeLog.xml"},
|
||||||
{ "zip": "starboard", "file": "starboard-changeLog.xml"},
|
{ "zip": "starboard", "file": "starboard-changeLog.xml"},
|
||||||
|
{ "zip": "remind", "file": "remind-changeLog.xml"},
|
||||||
{ "zip": "starboard-custom", "file": "starboard-custom-changeLog.xml"}
|
{ "zip": "starboard-custom", "file": "starboard-custom-changeLog.xml"}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,7 +11,11 @@ services:
|
|||||||
build: pgAdmin
|
build: pgAdmin
|
||||||
image: ${REGISTRY_PREFIX}oneplus_bot_pg_admin:${VERSION:-latest}
|
image: ${REGISTRY_PREFIX}oneplus_bot_pg_admin:${VERSION:-latest}
|
||||||
deployment_container:
|
deployment_container:
|
||||||
build: deployment
|
build:
|
||||||
|
context: deployment
|
||||||
|
args:
|
||||||
|
ABSTRACTO_REGISTRY_PREFIX: ${ABSTRACTO_REGISTRY_PREFIX}
|
||||||
|
ABSTRACTO_VERSION: ${ABSTRACTO_VERSION}
|
||||||
image: ${REGISTRY_PREFIX}oneplus_bot_deployment:${VERSION:-latest}
|
image: ${REGISTRY_PREFIX}oneplus_bot_deployment:${VERSION:-latest}
|
||||||
prometheus:
|
prometheus:
|
||||||
build: prometheus
|
build: prometheus
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -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"]
|
||||||
@@ -11,7 +11,7 @@ scrape_configs:
|
|||||||
scheme: http
|
scheme: http
|
||||||
static_configs:
|
static_configs:
|
||||||
- targets:
|
- targets:
|
||||||
- 172.17.0.1:8080
|
- oneplusbot:8080
|
||||||
basic_auth:
|
basic_auth:
|
||||||
username: "abstracto"
|
username: "abstracto"
|
||||||
password_file: /etc/prometheus/micrometer_password
|
password_file: /etc/prometheus/micrometer_password
|
||||||
@@ -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.1</version>
|
<version>1.3.8</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
10
pom.xml
10
pom.xml
@@ -12,13 +12,15 @@
|
|||||||
|
|
||||||
<groupId>dev.sheldan.oneplus.bot</groupId>
|
<groupId>dev.sheldan.oneplus.bot</groupId>
|
||||||
<artifactId>oneplusbot</artifactId>
|
<artifactId>oneplusbot</artifactId>
|
||||||
<version>1.1</version>
|
<version>1.3.8</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>
|
<!-- edit in release.yml as well -->
|
||||||
<abstracto.templates.version>1.2</abstracto.templates.version>
|
<!-- when releasing a new opbot version, update the docker-compose as well-->
|
||||||
|
<abstracto.version>1.2.8</abstracto.version>
|
||||||
|
<abstracto.templates.version>1.2.4</abstracto.templates.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
@@ -54,7 +56,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>oneplusbot-1.1</tag>
|
<tag>oneplusbot-1.3.8</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.1</version>
|
<version>1.3.8</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.1</version>
|
<version>1.3.8</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.1</version>
|
<version>1.3.8</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
18
templates/overrides/pom.xml
Normal file
18
templates/overrides/pom.xml
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
|
<parent>
|
||||||
|
<groupId>dev.sheldan.oneplus.bot.templates</groupId>
|
||||||
|
<artifactId>templates</artifactId>
|
||||||
|
<version>1.3.8</version>
|
||||||
|
</parent>
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
<groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
|
||||||
|
<artifactId>overrides</artifactId>
|
||||||
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
|
<modules>
|
||||||
|
<module>template-overrides</module>
|
||||||
|
</modules>
|
||||||
|
|
||||||
|
</project>
|
||||||
21
templates/overrides/template-overrides/pom.xml
Normal file
21
templates/overrides/template-overrides/pom.xml
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
|
<parent>
|
||||||
|
<groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
|
||||||
|
<artifactId>overrides</artifactId>
|
||||||
|
<version>1.3.8</version>
|
||||||
|
</parent>
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
<groupId>dev.sheldan.oneplus.bot.templates.overrides.templates</groupId>
|
||||||
|
<artifactId>template-overrides</artifactId>
|
||||||
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
|
|
||||||
|
<modules>
|
||||||
|
<module>webservices</module>
|
||||||
|
</modules>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
</project>
|
||||||
37
templates/overrides/template-overrides/webservices/pom.xml
Normal file
37
templates/overrides/template-overrides/webservices/pom.xml
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||||
|
<parent>
|
||||||
|
<groupId>dev.sheldan.oneplus.bot.templates.overrides.templates</groupId>
|
||||||
|
<artifactId>template-overrides</artifactId>
|
||||||
|
<version>1.3.8</version>
|
||||||
|
</parent>
|
||||||
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
<artifactId>webservices</artifactId>
|
||||||
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
|
<build>
|
||||||
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-assembly-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<phase>package</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>single</goal>
|
||||||
|
</goals>
|
||||||
|
<configuration>
|
||||||
|
<finalName>template-overrides-webservices-${project.version}</finalName>
|
||||||
|
<appendAssemblyId>false</appendAssemblyId>
|
||||||
|
<descriptors>
|
||||||
|
<descriptor>src/main/assembly/assembly.xml</descriptor>
|
||||||
|
</descriptors>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
|
||||||
|
</project>
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
|
||||||
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
|
||||||
|
<id>zip</id>
|
||||||
|
<includeBaseDirectory>false</includeBaseDirectory>
|
||||||
|
<formats>
|
||||||
|
<format>zip</format>
|
||||||
|
</formats>
|
||||||
|
<fileSets>
|
||||||
|
<fileSet>
|
||||||
|
<outputDirectory>.</outputDirectory>
|
||||||
|
<directory>${project.basedir}/src/main/resources</directory>
|
||||||
|
</fileSet>
|
||||||
|
</fileSets>
|
||||||
|
</assembly>
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
{
|
||||||
|
<#include "abstracto_color">,
|
||||||
|
"fields": [
|
||||||
|
{
|
||||||
|
"name": "<@safe_include "urban_search_command_response_embed_field_title_link"/>",
|
||||||
|
"value": "${definition.url?json_string}",
|
||||||
|
"inline": "true"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "<@safe_include "urban_search_command_response_embed_field_title_example"/>",
|
||||||
|
"value": "${definition.example?json_string}",
|
||||||
|
"inline": "true"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"additionalMessage": "${definition.definition?json_string}",
|
||||||
|
"messageLimit": 1
|
||||||
|
}
|
||||||
@@ -4,17 +4,18 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>dev.sheldan.oneplus.bot</groupId>
|
<groupId>dev.sheldan.oneplus.bot</groupId>
|
||||||
<artifactId>oneplusbot</artifactId>
|
<artifactId>oneplusbot</artifactId>
|
||||||
<version>1.1</version>
|
<version>1.3.8</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
<module>oneplus-bot-modules</module>
|
<module>oneplus-bot-modules</module>
|
||||||
<module>translations</module>
|
<module>translations</module>
|
||||||
|
<module>overrides</module>
|
||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
<groupId>dev.sheldan.oneplus.bot.templates</groupId>
|
<groupId>dev.sheldan.oneplus.bot.templates</groupId>
|
||||||
<artifactId>templates</artifactId>
|
<artifactId>templates</artifactId>
|
||||||
<version>1.1</version>
|
<version>1.3.8</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.1</version>
|
<version>1.3.8</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.1</version>
|
<version>1.3.8</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user