Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package com.github.corruptedinc.corruptedmainframe
import com.beust.klaxon.Klaxon
import java.io.File

class Config(val token: String, val permaAdmins: List<String>, val databaseUrl: String, val databaseDriver: String, val gitUrl: String, val blueAllianceToken: String) {
class Config(val token: String, val permaAdmins: List<String>, val databaseUrl: String, val databaseDriver: String, val gitUrl: String, val blueAllianceToken: String, val databaseUser: String, val databasePassword: String) {
companion object {
fun load(file: File): Config? {
// TODO: replace klaxon with something else, jackson is seemingly also in the jar
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ class Bot(val config: Config) {
Database.connect(
config.databaseUrl,
driver = config.databaseDriver,
user = config.databaseUser,
password = config.databasePassword,
databaseConfig = DatabaseConfig { useNestedTransactions = true } // TODO: make individual functions not start their own transactions
), this)
// private val buttonListeners = mutableListOf<(ButtonInteractionEvent) -> Unit>()
Expand Down
25 changes: 25 additions & 0 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
services:
bot:
build: .
environment:
POSTGRES_PASSWORD: postgres
depends_on:
- db
db:
image: postgres:latest
environment:
POSTGRES_USER: postgres
POSTGRES_PASSWORD: postgres
POSTGRES_DB: postgres
ports:
- "5432:5432"
restart: always
volumes:
- pgdata:/var/lib/postgresql/data


networks:
default:

volumes:
pgdata:
12 changes: 0 additions & 12 deletions image/build.sh

This file was deleted.