diff --git a/data/database.conf b/data/database.conf deleted file mode 100644 index 3ef45f4..0000000 --- a/data/database.conf +++ /dev/null @@ -1,5 +0,0 @@ -db { - url = "jdbc:h2:${DatabaseHome};MVCC=true" - user = "sa" - password = "sa" -} diff --git a/docker-compose.yml b/docker-compose.yml index 7647f95..5faa610 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,10 +4,14 @@ main-gitbucket: image: pgollor/gitbucket restart: always + environment: + - GITBUCKET_DATABASE_HOST=172.22.2.251 + - GITBUCKET_DATABASE_NAME=${GITBUCKET_DATABASE_NAME} + - GITBUCKET_DATABASE_USER=${GITBUCKET_DATABASE_USER} + - GITBUCKET_DATABASE_PASSWORD=${GITBUCKET_DATABASE_PASSWORD} volumes: - ./data/repositories:/srv/gitbucket/repositories - ./data/data.mv.db:/srv/gitbucket/data.mv.db - - ./data/database.conf:/srv/gitbucket/database.conf - ./data/gitbucket.conf:/srv/gitbucket/gitbucket.conf ports: - "${GITBUCKET_BIND:-127.0.0.1}:${GITBUCKET_WEB_PORT:-8080}:8080" @@ -23,7 +27,7 @@ restart: always environment: - MYSQL_ROOT_PASSWORD=${GITBUCKET_DATABASE_ROOT} - - MYSQL_DATABASE=${GITBUCKET_DATABASE} + - MYSQL_DATABASE=${GITBUCKET_DATABASE_NAME} - MYSQL_USER=${GITBUCKET_DATABASE_USER} - MYSQL_PASSWORD=${GITBUCKET_DATABASE_PASSWORD} volumes: diff --git a/gitbucket.conf b/gitbucket.conf index 29db8ef..cd01c7e 100644 --- a/gitbucket.conf +++ b/gitbucket.conf @@ -14,7 +14,7 @@ GITBUCKET_DATABASE_ROOT=83wwX7YMRKnVIsGIxPyPwu9u6SaZ # database for gibucket -GITBUCKET_DATABASE=gitbucket +GITBUCKET_DATABASE_NAME=gitbucket # database user GITBUCKET_DATABASE_USER=gitbucket