Sheldan/OnePlusBot
1
0
Fork 0
mirror of https://github.com/Sheldan/OnePlusBot.git synced 2026-01-22 07:38:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

[OPB-8] adding oneplus bot version to docker compose

Browse Source 
changing port forwards to be local forwards
This commit is contained in:
Sheldan
2021-04-05 01:24:21 +02:00
parent b3fafac81f
commit 698d34c0e0
3 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
deployment/docker-compose/src/main/resources/.env
View File

@@ -26,3 +26,4 @@ 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> YOUTUBE_API_KEY=<INSERT KEY>
ONEPLUS_BOT_VERSION=1.3.7

24
deployment/docker-compose/src/main/resources/docker-compose.yml
View File

@@ -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
@@ -53,8 +53,8 @@ services:
YOUTUBE_API_KEY: ${YOUTUBE_API_KEY} 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: volumes:
@@ -62,24 +62,24 @@ services:
- ./config:/config - ./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
@@ -88,12 +88,12 @@ services:
- prometheus-data:/prometheus - 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

2
deployment/image-packaging/src/main/docker/prometheus/prometheus.yml
View File

@@ -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