diff --git a/.env.example b/.env.example
index 37f4a30..f548c3f 100644
--- a/.env.example
+++ b/.env.example
@@ -1,4 +1,5 @@
NETNEUTRALITY_TAG=latest
+
NETNEUTRALITY_BOT_ENV=dev
NETNEUTRALITY_BOT_TOKEN=
NETNEUTRALITY_BOT_PREFIX=$
@@ -6,10 +7,12 @@ NETNEUTRALITY_BOT_OWNER=
NETNEUTRALITY_API_PORT=9000
MYSQL_HOST=127.0.0.1
-MYSQL_USER=root
-MYSQL_PASSWORD=
-MYSQL_DATABASE=
MYSQL_PORT=3306
+MYSQL_USER=java
+MYSQL_PASSWORD=password
+MYSQL_DATABASE=netneutrality
+MYSQL_ROOT_PASSWORD=password
+MARIADB_AUTO_UPGRADE=1
NETNEUTRALITY_PO_TOKEN=
NETNEUTRALITY_VISITOR_DATA=
diff --git a/docker-compose.yml b/docker-compose.yml
index ca326a3..2b12427 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,43 +1,39 @@
services:
- db:
+ netneutrality-db:
image: mariadb:lts
container_name: db
restart: unless-stopped
+ networks:
+ - netneutrality
volumes:
- netneutrality-db:/var/lib/mysql
environment:
- MYSQL_USER: 'java'
- MYSQL_PASSWORD: 'password'
- MYSQL_DATABASE: 'netneutrality'
- MYSQL_ROOT_PASSWORD: 'password'
- MARIADB_AUTO_UPGRADE: '1'
- ports:
- - "3306:3306"
- networks:
- - internal
+ MYSQL_USER: java
+ MYSQL_PASSWORD: password
+ MYSQL_DATABASE: netneutrality
+ MYSQL_ROOT_PASSWORD: password
+ MARIADB_AUTO_UPGRADE: 1
- bot:
+ netneutrality-bot:
image: registry.bobert.me/anthorob/netneutrality:${NETNEUTRALITY_TAG:-latest}
container_name: bot
restart: unless-stopped
+ env_file: .env
+ networks:
+ - netneutrality
depends_on:
- - db
+ - netneutrality-db
volumes:
- ./logs:/app/logs
environment:
- MYSQL_HOST: 'db'
- MYSQL_PORT: '3306'
- MYSQL_USER: 'java'
- MYSQL_PASSWORD: 'password'
- MYSQL_DATABASE: 'netneutrality'
- env_file: ".env"
- ports:
- - "9000:9000"
- networks:
- - internal
+ MYSQL_HOST: netneutrality-db
+ MYSQL_PORT: 3306
+ MYSQL_USER: java
+ MYSQL_PASSWORD: password
+ MYSQL_DATABASE: netneutrality
volumes:
- netneutrality-db:
+ netneutrality-db: null
networks:
- internal:
\ No newline at end of file
+ netneutrality: null
diff --git a/pom.xml b/pom.xml
index e498d9d..0d4d1cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -212,7 +212,7 @@
org.gitlab4j
gitlab4j-api
- 6.0.0-rc.10
+ 6.1.0