diff --git a/.idea/.gitignore b/.idea/.gitignore index 3ad53bc..f50cf27 100644 --- a/.idea/.gitignore +++ b/.idea/.gitignore @@ -5,6 +5,5 @@ /dataSources.local.xml /compiler.xml /uiDesigner.xml -/dataSources.xml /sonarlint/ /jarRepositories.xml \ No newline at end of file diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml new file mode 100644 index 0000000..7b7cef8 --- /dev/null +++ b/.idea/dataSources.xml @@ -0,0 +1,12 @@ + + + + + postgresql + true + org.postgresql.Driver + jdbc:postgresql://localhost:5555/json_test + $ProjectFileDir$ + + + \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 09dc326..0e8ea03 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ # To execute this docker-compose yml file use docker-compose -f up # Add the "-d" flag at the end for detached execution -version: '3.7' +version: '3.8' services: db: container_name: postgres_json diff --git a/docker/postgresql/Dockerfile b/docker/postgresql/Dockerfile index f315eb7..feacb49 100644 --- a/docker/postgresql/Dockerfile +++ b/docker/postgresql/Dockerfile @@ -1,4 +1,4 @@ -FROM postgres:11 +FROM postgres:13 COPY postgresql.conf /tmp/postgresql.conf COPY extension.sh /docker-entrypoint-initdb.d/000-extension.sh diff --git a/docker/postgresql/postgresql.conf b/docker/postgresql/postgresql.conf index fd24ea8..1cb589f 100644 --- a/docker/postgresql/postgresql.conf +++ b/docker/postgresql/postgresql.conf @@ -664,5 +664,3 @@ log_rotation_size = 100MB #------------------------------------------------------------------------------ # Add settings for extensions here - -zdb.default_elasticsearch_url = 'http://elasticsearch:9200/'