mirror of
https://github.com/Sheldan/OnePlusBot.git
synced 2026-01-02 07:44:18 +00:00
Compare commits
30 Commits
oneplusbot
...
oneplusbot
| Author | SHA1 | Date | |
|---|---|---|---|
|
c1701accc6 | ||
|
|
cac654fc10 | ||
|
|
72c8d4dbf3 | ||
|
|
563f2bd35a | ||
|
|
3f54b4c57d | ||
|
|
0ca48d1676 | ||
|
|
01232e1a7a | ||
|
|
7284ddc1f1 | ||
|
|
90f88f6254 | ||
|
|
05c95a0a00 | ||
|
|
88cb53fad1 | ||
|
|
b445b1c99b | ||
|
|
313670d87f | ||
|
|
7810acc5b8 | ||
|
|
ce6a2da5d1 | ||
|
|
0220254c84 | ||
|
|
e369802bda | ||
|
|
718445bbd6 | ||
|
|
6b777c9f20 | ||
|
|
d254f111b4 | ||
|
|
fef4b0ad01 | ||
|
|
ac93e11a47 | ||
|
|
5bfe4a4aeb | ||
|
|
216c578e08 | ||
|
|
568cc85907 | ||
|
|
b19b3a9840 | ||
|
|
54359e513e | ||
|
|
65a86d2a52 | ||
|
|
704d18e2f6 | ||
|
|
82d889019c |
4
.env
4
.env
@@ -1,4 +1,4 @@
|
||||
REGISTRY_PREFIX=harbor.sheldan.dev/oneplus-bot/
|
||||
ABSTRACTO_PREFIX=harbor.sheldan.dev/abstracto/
|
||||
VERSION=1.6.19
|
||||
ABSTRACTO_VERSION=1.5.25
|
||||
VERSION=1.6.26
|
||||
ABSTRACTO_VERSION=1.5.35
|
||||
3
.github/workflows/release_manual.yaml
vendored
3
.github/workflows/release_manual.yaml
vendored
@@ -60,7 +60,8 @@ jobs:
|
||||
"bot.tag": "${{ env.version }}",
|
||||
"templateDeploymentData.tag": "${{ env.version }}",
|
||||
"dbConfigDeploymentData.tag": "${{ env.version }}",
|
||||
"privateRestApi.tag": "${{ env.version }}"
|
||||
"privateRestApi.tag": "${{ env.version }}",
|
||||
"restApi.tag": "${{ env.version }}"
|
||||
}
|
||||
- name: Update .env version
|
||||
run:
|
||||
|
||||
2
.gitignore
vendored
2
.gitignore
vendored
@@ -22,5 +22,7 @@ target/
|
||||
*.rar
|
||||
*.tgz
|
||||
|
||||
Chart.lock
|
||||
|
||||
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
|
||||
hs_err_pid*
|
||||
|
||||
3
.tiltignore
Normal file
3
.tiltignore
Normal file
@@ -0,0 +1,3 @@
|
||||
*.tgz
|
||||
tilt/oneplusbot-dev/tmpcharts/
|
||||
tilt/oneplusbot-dev/charts/*.tgz
|
||||
@@ -11,11 +11,3 @@ Custom features which were ported
|
||||
- [x] Setup channel handling
|
||||
- [x] Referral link handling
|
||||
|
||||
# Technologies used in addition to the ones provided in abstracto
|
||||
- [grafana](https://github.com/grafana/grafana) for visualization of the bot status and metrics
|
||||
- [Loki](https://github.com/grafana/loki) to visualize and query log files
|
||||
- [pgAdmin](https://github.com/postgres/pgadmin4) to view the database
|
||||
- [prometheus](https://github.com/prometheus/prometheus) for metric collection
|
||||
- [postgres](https://github.com/postgres/postgres) as a database
|
||||
- [loki](https://github.com/grafana/loki) for log aggregation
|
||||
|
||||
6
Tiltfile
6
Tiltfile
@@ -18,7 +18,7 @@ local_resource(
|
||||
docker_build_with_restart(
|
||||
registry + 'oneplus-bot-image',
|
||||
'./application/executable/target/jar',
|
||||
entrypoint=['java', '-noverify', '-cp', '.:./lib/*', 'dev.sheldan.oneplus.bot.executable.Application'],
|
||||
entrypoint=['java', '-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005', '-cp', '.:./lib/*', 'dev.sheldan.oneplus.bot.executable.Application'],
|
||||
dockerfile='./application/executable/Dockerfile',
|
||||
live_update=[
|
||||
sync('./application/executable/target/jar/BOOT-INF/lib', '/app/lib'),
|
||||
@@ -31,9 +31,11 @@ docker_build_with_restart(
|
||||
docker_build(registry + 'oneplus-bot-db-data', 'deployment/image-packaging/src/main/docker/db-data/')
|
||||
docker_build(registry + 'oneplus-bot-template-data', 'deployment/image-packaging/src/main/docker/template-data/')
|
||||
docker_build(registry + 'oneplus-bot-private-rest-api', 'deployment/image-packaging/src/main/docker/private-rest-api/', build_args={'REGISTRY_PREFIX': abstracto_registry})
|
||||
docker_build(registry + 'oneplus-bot-rest-api', 'deployment/image-packaging/src/main/docker/rest-api/', build_args={'REGISTRY_PREFIX': abstracto_registry})
|
||||
|
||||
|
||||
k8s_yaml(helm('deployment/helm/oneplus-bot', values=
|
||||
local('cd tilt/oneplusbot-dev && helm dep up')
|
||||
k8s_yaml(helm('tilt/oneplusbot-dev', values=
|
||||
['./../OnePlusBot-environments/argocd/apps/oneplus-bot/values/local/values.yaml',
|
||||
'secrets://./../OnePlusBot-environments/argocd/apps/oneplus-bot/values/local/values.secrets.yaml']
|
||||
))
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.application</groupId>
|
||||
<artifactId>application</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<artifactId>executable</artifactId>
|
||||
|
||||
@@ -2,8 +2,8 @@ spring.datasource.url=jdbc:postgresql://${DB_HOST}:${DB_PORT}/${DB_NAME}
|
||||
spring.datasource.username= ${DB_USER}
|
||||
spring.datasource.password= ${DB_PASS}
|
||||
spring.datasource.hikari.maximum-pool-size=${hikariPoolSize}
|
||||
spring.jpa.hibernate.default_schema=abstracto
|
||||
spring.jpa.properties.hibernate.default_schema=abstracto
|
||||
spring.jpa.hibernate.default_schema=${DB_SCHEMA}
|
||||
spring.jpa.properties.hibernate.default_schema=${DB_SCHEMA}
|
||||
spring.quartz.jdbc.initialize-schema=never
|
||||
management.metrics.tags.application=OnePlusBot
|
||||
management.endpoint.health.probes.enabled=true
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.application.custom</groupId>
|
||||
<artifactId>oneplus-bot-customizations</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<artifactId>oneplus-bot-customizations</artifactId>
|
||||
<groupId>dev.sheldan.oneplus.bot.application.custom</groupId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.application</groupId>
|
||||
<artifactId>application</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.application.custom</groupId>
|
||||
<artifactId>oneplus-bot-customizations</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<artifactId>oneplus-bot-modules</artifactId>
|
||||
<groupId>dev.sheldan.oneplus.bot.application.modules</groupId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.application.modules</groupId>
|
||||
<artifactId>oneplus-bot-modules</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.application</groupId>
|
||||
<artifactId>application</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.application.modules</groupId>
|
||||
<artifactId>oneplus-bot-modules</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.application.modules</groupId>
|
||||
<artifactId>oneplus-bot-modules</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<artifactId>oneplus-bot-modules</artifactId>
|
||||
<groupId>dev.sheldan.oneplus.bot.application.modules</groupId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -5,13 +5,13 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot</groupId>
|
||||
<artifactId>oneplusbot</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
|
||||
<groupId>dev.sheldan.oneplus.bot.application</groupId>
|
||||
<artifactId>application</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
<modules>
|
||||
<module>executable</module>
|
||||
<module>oneplus-bot-customizations</module>
|
||||
|
||||
@@ -2,4 +2,4 @@ apiVersion: v2
|
||||
name: oneplus-bot
|
||||
description: A Helm chart for Kubernetes
|
||||
type: application
|
||||
version: 1.6.19
|
||||
version: 1.6.26
|
||||
|
||||
@@ -48,7 +48,7 @@ spec:
|
||||
name: db-credentials
|
||||
key: dbName
|
||||
- name: DB_SCHEME
|
||||
value: "abstracto"
|
||||
value: {{ .Values.dbCredentials.schema }}
|
||||
volumeMounts:
|
||||
- mountPath: "/var/db-config/"
|
||||
name: database-config-mount
|
||||
|
||||
@@ -57,6 +57,8 @@ spec:
|
||||
secretKeyRef:
|
||||
name: db-credentials
|
||||
key: dbName
|
||||
- name: DB_SCHEMA
|
||||
value: {{ .Values.dbCredentials.schema }}
|
||||
- name: NEWS_FORUM_POST_NOTIFICATION_SERVER_ID
|
||||
value: "{{ .Values.bot.config.newsForumPostNotificationServerId }}"
|
||||
- name: TOKEN
|
||||
@@ -75,6 +77,8 @@ spec:
|
||||
value: "{{ .Values.privateRestApi.service.name }}.{{ .Release.Namespace }}.svc.cluster.local"
|
||||
- name: PRIVATE_REST_API_PORT
|
||||
value: "{{ .Values.privateRestApi.service.targetPort }}"
|
||||
- name: FRONTEND_BASE
|
||||
value: "https://{{ .Values.bot.host }}"
|
||||
{{- range $key, $value := .Values.bot.propertyConfig }}
|
||||
- name: {{ $key | quote }}
|
||||
value: {{ $value | quote}}
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
{{- if .Values.restApi.enabled -}}
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: {{ include "oneplusBot.fullname" . }}-rest-api
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
app: rest-api
|
||||
template:
|
||||
metadata:
|
||||
{{- with .Values.restApi.podAnnotations }}
|
||||
annotations:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
labels:
|
||||
app: rest-api
|
||||
spec:
|
||||
{{- with .Values.imagePullSecrets }}
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
serviceAccountName: {{ include "oneplusBot.serviceAccountName" . }}
|
||||
securityContext:
|
||||
{{- toYaml .Values.restApi.podSecurityContext | nindent 8 }}
|
||||
containers:
|
||||
- name: {{ .Chart.Name }}-rest-api
|
||||
securityContext:
|
||||
{{- toYaml .Values.restApi.securityContext | nindent 12 }}
|
||||
image: "{{ .Values.restApi.repository }}/{{ .Values.restApi.image }}:{{ .Values.restApi.tag | default .Chart.AppVersion }}"
|
||||
imagePullPolicy: {{ .Values.restApi.pullPolicy }}
|
||||
env:
|
||||
- name: BACKEND_HOST
|
||||
value: "{{ include "oneplusBot.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local"
|
||||
- name: BACKEND_PORT
|
||||
value: "{{ .Values.service.port }}"
|
||||
ports:
|
||||
- name: {{ .Values.restApi.service.name }}
|
||||
containerPort: {{ .Values.restApi.service.port }}
|
||||
protocol: TCP
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
path: /
|
||||
port: {{ .Values.restApi.service.port }}
|
||||
initialDelaySeconds: {{ $.Values.restApi.livenessProbe.initialDelaySeconds }}
|
||||
periodSeconds: {{ $.Values.restApi.livenessProbe.periodSeconds }}
|
||||
failureThreshold: {{ $.Values.restApi.livenessProbe.failureThreshold }}
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
path: /
|
||||
port: {{ .Values.restApi.service.port }}
|
||||
initialDelaySeconds: {{ $.Values.restApi.readinessProbe.initialDelaySeconds }}
|
||||
periodSeconds: {{ $.Values.restApi.readinessProbe.periodSeconds }}
|
||||
failureThreshold: {{ $.Values.restApi.readinessProbe.failureThreshold }}
|
||||
resources:
|
||||
{{- toYaml .Values.restApi.resources | nindent 12 }}
|
||||
{{- with .Values.restApi.nodeSelector }}
|
||||
nodeSelector:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- with .Values.restApi.affinity }}
|
||||
affinity:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- with .Values.restApi.tolerations }}
|
||||
tolerations:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
45
deployment/helm/oneplus-bot/templates/rest-api-ingress.yaml
Normal file
45
deployment/helm/oneplus-bot/templates/rest-api-ingress.yaml
Normal file
@@ -0,0 +1,45 @@
|
||||
{{- if .Values.restApi.enabled -}}
|
||||
{{- $servicePort := .Values.restApi.service.port -}}
|
||||
{{- $serviceName := .Values.restApi.service.name -}}
|
||||
{{- $ingressPath := .Values.restApi.ingress.path -}}
|
||||
{{- $ingressPathType := .Values.restApi.ingress.pathType -}}
|
||||
{{- $extraPaths := .Values.restApi.ingress.extraPaths -}}
|
||||
apiVersion: networking.k8s.io/v1
|
||||
kind: Ingress
|
||||
metadata:
|
||||
name: ingress-rest-api
|
||||
labels:
|
||||
{{- with .Values.restApi.ingress.labels }}
|
||||
{{- toYaml . | nindent 4 }}
|
||||
{{- end }}
|
||||
{{- with .Values.restApi.ingress.annotations }}
|
||||
annotations:
|
||||
{{- range $key, $value := . }}
|
||||
{{ $key }}: {{ tpl $value $ | quote }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
spec:
|
||||
ingressClassName: nginx
|
||||
{{- with .Values.restApi.ingress.tls }}
|
||||
tls:
|
||||
{{- tpl (toYaml .) $ | nindent 4 }}
|
||||
{{- end }}
|
||||
rules:
|
||||
{{- if .Values.restApi.ingress.hosts }}
|
||||
{{- range .Values.restApi.ingress.hosts }}
|
||||
- host: {{ tpl . $ }}
|
||||
http:
|
||||
paths:
|
||||
{{- with $extraPaths }}
|
||||
{{- toYaml . | nindent 10 }}
|
||||
{{- end }}
|
||||
- path: {{ $ingressPath }}
|
||||
pathType: {{ $ingressPathType }}
|
||||
backend:
|
||||
service:
|
||||
name: {{ $serviceName }}
|
||||
port:
|
||||
number: {{ $servicePort }}
|
||||
{{- end }}
|
||||
{{- end -}}
|
||||
{{- end }}
|
||||
12
deployment/helm/oneplus-bot/templates/rest-api-service.yaml
Normal file
12
deployment/helm/oneplus-bot/templates/rest-api-service.yaml
Normal file
@@ -0,0 +1,12 @@
|
||||
{{- if .Values.restApi.enabled -}}
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: {{ .Values.restApi.service.name }}
|
||||
spec:
|
||||
selector:
|
||||
app: rest-api
|
||||
ports:
|
||||
- port: {{ .Values.restApi.service.targetPort }}
|
||||
targetPort: {{ .Values.restApi.service.port }}
|
||||
{{- end }}
|
||||
@@ -48,7 +48,7 @@ spec:
|
||||
name: db-credentials
|
||||
key: dbName
|
||||
- name: DB_SCHEME
|
||||
value: "abstracto."
|
||||
value: "{{ .Values.dbCredentials.schema }}."
|
||||
volumeMounts:
|
||||
- mountPath: "/var/template-config/"
|
||||
name: template-config-mount
|
||||
|
||||
@@ -3,7 +3,7 @@ bot:
|
||||
repository: harbor.sheldan.dev/oneplus-bot
|
||||
pullPolicy: IfNotPresent
|
||||
image: oneplus-bot-image
|
||||
tag: 1.6.19
|
||||
tag: 1.6.26
|
||||
livenessProbe:
|
||||
initialDelaySeconds: 60
|
||||
periodSeconds: 5
|
||||
@@ -16,40 +16,42 @@ bot:
|
||||
newsForumPostNotificationServerId: null
|
||||
propertyConfig:
|
||||
hikariPoolSize: 10
|
||||
host:
|
||||
templateDeployment:
|
||||
enabled: true
|
||||
repository: harbor.sheldan.dev/abstracto
|
||||
pullPolicy: Always
|
||||
image: abstracto-template-deployment
|
||||
tag: 1.5.25
|
||||
tag: 1.5.35
|
||||
templateDeploymentData:
|
||||
repository: harbor.sheldan.dev/oneplus-bot
|
||||
pullPolicy: Always
|
||||
image: oneplus-bot-template-data
|
||||
tag: 1.6.19
|
||||
tag: 1.6.26
|
||||
dbConfigDeployment:
|
||||
enabled: true
|
||||
repository: harbor.sheldan.dev/abstracto
|
||||
pullPolicy: Always
|
||||
image: abstracto-db-deployment
|
||||
tag: 1.5.25
|
||||
tag: 1.5.35
|
||||
dbConfigDeploymentData:
|
||||
repository: harbor.sheldan.dev/oneplus-bot
|
||||
pullPolicy: Always
|
||||
image: oneplus-bot-db-data
|
||||
tag: 1.6.19
|
||||
tag: 1.6.26
|
||||
dbCredentials:
|
||||
host: null
|
||||
port: null
|
||||
userName: null
|
||||
password: null
|
||||
name: null
|
||||
schema: abstracto
|
||||
privateRestApi:
|
||||
enabled: true
|
||||
repository: harbor.sheldan.dev/oneplus-bot
|
||||
pullPolicy: Always
|
||||
image: oneplus-bot-private-rest-api
|
||||
tag: 1.6.19
|
||||
tag: 1.6.26
|
||||
podAnnotations: {}
|
||||
podSecurityContext: {}
|
||||
securityContext: {}
|
||||
@@ -75,6 +77,46 @@ privateRestApi:
|
||||
nodeSelector: {}
|
||||
tolerations: []
|
||||
affinity: {}
|
||||
restApi:
|
||||
enabled: true
|
||||
repository: harbor.sheldan.dev/oneplus-bot
|
||||
pullPolicy: Always
|
||||
image: oneplus-bot-rest-api
|
||||
tag: 1.6.26
|
||||
podAnnotations: {}
|
||||
podSecurityContext: {}
|
||||
securityContext: {}
|
||||
livenessProbe:
|
||||
initialDelaySeconds: 2
|
||||
periodSeconds: 5
|
||||
failureThreshold: 3
|
||||
readinessProbe:
|
||||
initialDelaySeconds: 2
|
||||
periodSeconds: 5
|
||||
failureThreshold: 3
|
||||
service:
|
||||
port: 8080
|
||||
targetPort: 80
|
||||
name: rest-api
|
||||
resources:
|
||||
limits:
|
||||
cpu: null
|
||||
memory: null
|
||||
requests:
|
||||
cpu: null
|
||||
memory: null
|
||||
nodeSelector: {}
|
||||
tolerations: []
|
||||
affinity: {}
|
||||
ingress:
|
||||
enabled: false
|
||||
annotations: {}
|
||||
labels: {}
|
||||
path: /
|
||||
pathType: Prefix
|
||||
hosts: null
|
||||
extraPaths: []
|
||||
tls: []
|
||||
grafanaDeployment:
|
||||
repository: harbor.sheldan.dev/grafana-tools
|
||||
pullPolicy: Always
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.deployment</groupId>
|
||||
<artifactId>deployment</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
ARG REGISTRY_PREFIX
|
||||
ARG ABSTRACTO_VERSION
|
||||
FROM ${REGISTRY_PREFIX}abstracto-rest-api-experience:${ABSTRACTO_VERSION:-latest} AS experience-api
|
||||
FROM ${REGISTRY_PREFIX}abstracto-rest-api-core:${ABSTRACTO_VERSION:-latest} AS core-api
|
||||
|
||||
|
||||
FROM ${REGISTRY_PREFIX}abstracto-rest-api:${ABSTRACTO_VERSION:-latest}
|
||||
COPY --from=core-api /python /python
|
||||
COPY --from=experience-api /python /python
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<artifactId>oneplusbot</artifactId>
|
||||
<groupId>dev.sheldan.oneplus.bot</groupId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
version: "3.7"
|
||||
version: "3.8"
|
||||
|
||||
services:
|
||||
bot:
|
||||
@@ -16,6 +16,13 @@ services:
|
||||
REGISTRY_PREFIX: ${ABSTRACTO_PREFIX}
|
||||
ABSTRACTO_VERSION: ${ABSTRACTO_VERSION}
|
||||
image: ${REGISTRY_PREFIX}oneplus-bot-private-rest-api:${VERSION:-latest}
|
||||
rest-api-packaging:
|
||||
build:
|
||||
context: deployment/image-packaging/src/main/docker/rest-api
|
||||
args:
|
||||
REGISTRY_PREFIX: ${ABSTRACTO_PREFIX}
|
||||
ABSTRACTO_VERSION: ${ABSTRACTO_VERSION}
|
||||
image: ${REGISTRY_PREFIX}oneplus-bot-rest-api:${VERSION:-latest}
|
||||
template-data:
|
||||
build:
|
||||
context: deployment/image-packaging/src/main/docker/template-data
|
||||
|
||||
8
pom.xml
8
pom.xml
@@ -12,13 +12,13 @@
|
||||
|
||||
<groupId>dev.sheldan.oneplus.bot</groupId>
|
||||
<artifactId>oneplusbot</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.target>17</maven.compiler.target>
|
||||
<maven.compiler.source>17</maven.compiler.source>
|
||||
<abstracto.version>1.5.25</abstracto.version>
|
||||
<abstracto.templates.version>1.4.33</abstracto.templates.version>
|
||||
<abstracto.version>1.5.35</abstracto.version>
|
||||
<abstracto.templates.version>1.4.36</abstracto.templates.version>
|
||||
</properties>
|
||||
|
||||
<modules>
|
||||
@@ -69,6 +69,6 @@
|
||||
<connection>scm:git:${project.scm.url}</connection>
|
||||
<developerConnection>scm:git:${project.scm.url}</developerConnection>
|
||||
<url>https://github.com/Sheldan/OnePlusBot.git</url>
|
||||
<tag>oneplusbot-1.6.20</tag>
|
||||
<tag>oneplusbot-1.6.27</tag>
|
||||
</scm>
|
||||
</project>
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.templates.customizations</groupId>
|
||||
<artifactId>customization-templates</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.templates</groupId>
|
||||
<artifactId>oneplus-bot-templates</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.templates.customizations</groupId>
|
||||
<artifactId>customization-templates</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
|
||||
<artifactId>oneplus-bot-module-templates</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
|
||||
<artifactId>oneplus-bot-module-templates</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.templates</groupId>
|
||||
<artifactId>oneplus-bot-templates</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.templates.modules</groupId>
|
||||
<artifactId>oneplus-bot-module-templates</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -3,13 +3,13 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.templates</groupId>
|
||||
<artifactId>templates</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>oneplus-bot-templates</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
<modules>
|
||||
<module>module-templates</module>
|
||||
<module>customization-templates</module>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
|
||||
<artifactId>template-overrides</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
|
||||
<artifactId>template-overrides</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
|
||||
<artifactId>template-overrides</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
|
||||
<artifactId>template-overrides</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.templates</groupId>
|
||||
<artifactId>oneplus-bot-templates</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
|
||||
<artifactId>template-overrides</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.templates.overrides</groupId>
|
||||
<artifactId>template-overrides</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot</groupId>
|
||||
<artifactId>oneplusbot</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
|
||||
<modules>
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
<groupId>dev.sheldan.oneplus.bot.templates</groupId>
|
||||
<artifactId>templates</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
</project>
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.templates.translations.customizations</groupId>
|
||||
<artifactId>customization-translations</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.templates.translations.customizations</groupId>
|
||||
<artifactId>customization-translations</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.templates.translations</groupId>
|
||||
<artifactId>translations</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.templates.translations.customizations</groupId>
|
||||
<artifactId>customization-translations</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.templates.translations.modules</groupId>
|
||||
<artifactId>module-translations</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.templates.translations.modules</groupId>
|
||||
<artifactId>module-translations</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.templates.translations</groupId>
|
||||
<artifactId>translations</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.templates.translations.modules</groupId>
|
||||
<artifactId>module-translations</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.templates.translations.modules</groupId>
|
||||
<artifactId>module-translations</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.templates.translations.modules</groupId>
|
||||
<artifactId>module-translations</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.templates</groupId>
|
||||
<artifactId>templates</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.templates.translations.overrides</groupId>
|
||||
<artifactId>translation-overrides</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
<parent>
|
||||
<groupId>dev.sheldan.oneplus.bot.templates.translations</groupId>
|
||||
<artifactId>translations</artifactId>
|
||||
<version>1.6.20</version>
|
||||
<version>1.6.27</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
|
||||
11
tilt/oneplusbot-dev/Chart.yaml
Normal file
11
tilt/oneplusbot-dev/Chart.yaml
Normal file
@@ -0,0 +1,11 @@
|
||||
apiVersion: v2
|
||||
description: oneplusbot dev chart
|
||||
name: oneplusbot-dev
|
||||
version: 1.0.0
|
||||
dependencies:
|
||||
- name: oneplus-bot
|
||||
repository: file://../../deployment/helm/oneplus-bot
|
||||
version: ">= 0.0.1"
|
||||
- name: postgresql
|
||||
repository: oci://registry-1.docker.io/bitnamicharts
|
||||
version: 12.12.10 # 13.x.x uses postgresql 16.x
|
||||
Reference in New Issue
Block a user