diff --git a/deployment/docker-compose/src/main/resources/.env b/deployment/docker-compose/src/main/resources/.env index 24c3e81..400f4b6 100644 --- a/deployment/docker-compose/src/main/resources/.env +++ b/deployment/docker-compose/src/main/resources/.env @@ -25,4 +25,5 @@ PGADMIN_PORT=5050 PGADMIN_DEFAULT_EMAIL=sheldan@sheldan.dev PGADMIN_DEFAULT_PASSWORD=admin TOKEN= -YOUTUBE_API_KEY= \ No newline at end of file +YOUTUBE_API_KEY= +ONEPLUS_BOT_VERSION=1.3.7 \ No newline at end of file diff --git a/deployment/docker-compose/src/main/resources/docker-compose.yml b/deployment/docker-compose/src/main/resources/docker-compose.yml index b866bf9..53243c0 100644 --- a/deployment/docker-compose/src/main/resources/docker-compose.yml +++ b/deployment/docker-compose/src/main/resources/docker-compose.yml @@ -2,21 +2,21 @@ version: '3.7' services: db: - image: ${REGISTRY_PREFIX}oneplus_bot_database + image: ${REGISTRY_PREFIX}oneplus_bot_database:${ONEPLUS_BOT_VERSION} container_name: database restart: always environment: POSTGRES_PASSWORD: ${DATABASE_PASSWORD} POSTGRES_USER: ${DATABASE_USER} ports: - - "${DATABASE_PORT}:5432" + - "127.0.0.1:${DATABASE_PORT}:5432" networks: - oneplusbot volumes: - db-data:/var/lib/postgresql/data deployment_container: container_name: deployment - image: ${REGISTRY_PREFIX}oneplus_bot_deployment + image: ${REGISTRY_PREFIX}oneplus_bot_deployment:${ONEPLUS_BOT_VERSION} depends_on: - db environment: @@ -34,7 +34,7 @@ services: networks: - oneplusbot bot: - image: ${REGISTRY_PREFIX}oneplus_bot + image: ${REGISTRY_PREFIX}oneplus_bot:${ONEPLUS_BOT_VERSION} depends_on: - db - deployment_container @@ -53,8 +53,8 @@ services: 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" ports: - - "${DEBUG_PORT}:5005" - - "${TOMCAT_PORT}:8080" + - "127.0.0.1:${DEBUG_PORT}:5005" + - "127.0.0.1:${TOMCAT_PORT}:8080" networks: - oneplusbot volumes: @@ -62,24 +62,24 @@ services: - ./config:/config pgadmin: container_name: pgadmin - image: ${REGISTRY_PREFIX}oneplus_bot_pg_admin + image: ${REGISTRY_PREFIX}oneplus_bot_pg_admin:${ONEPLUS_BOT_VERSION} depends_on: - db environment: PGADMIN_DEFAULT_EMAIL: ${PGADMIN_DEFAULT_EMAIL} PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_DEFAULT_PASSWORD} ports: - - "${PGADMIN_PORT}:80" + - "127.0.0.1:${PGADMIN_PORT}:80" restart: unless-stopped networks: - oneplusbot prometheus: container_name: prometheus - image: ${REGISTRY_PREFIX}oneplus_bot_prometheus + image: ${REGISTRY_PREFIX}oneplus_bot_prometheus:${ONEPLUS_BOT_VERSION} depends_on: - bot ports: - - "${PROMETHEUS_PORT}:9090" + - "127.0.0.1:${PROMETHEUS_PORT}:9090" restart: unless-stopped networks: - oneplusbot @@ -88,12 +88,12 @@ services: - prometheus-data:/prometheus grafana: container_name: grafana - image: ${REGISTRY_PREFIX}oneplus_bot_grafana + image: ${REGISTRY_PREFIX}oneplus_bot_grafana:${ONEPLUS_BOT_VERSION} depends_on: - prometheus - bot ports: - - "${GRAFANA_PORT}:3000" + - "127.0.0.1:${GRAFANA_PORT}:3000" restart: unless-stopped volumes: - grafana-user-data:/var/lib/grafana diff --git a/deployment/image-packaging/src/main/docker/prometheus/prometheus.yml b/deployment/image-packaging/src/main/docker/prometheus/prometheus.yml index 103f8e5..ca405f7 100644 --- a/deployment/image-packaging/src/main/docker/prometheus/prometheus.yml +++ b/deployment/image-packaging/src/main/docker/prometheus/prometheus.yml @@ -11,7 +11,7 @@ scrape_configs: scheme: http static_configs: - targets: - - 172.17.0.1:8080 + - oneplusbot:8080 basic_auth: username: "abstracto" password_file: /etc/prometheus/micrometer_password \ No newline at end of file