Commit 712780e3 authored by Broughton, Mitchell's avatar Broughton, Mitchell
Browse files

updated environment variables

parent 25865257

COMMON_VERSION

+1 −1
Original line number Diff line number Diff line 
0.1.16
 
0.1.18

RELEASE_NOTES.md

+3 −0
Original line number Diff line number Diff line 
# VERSION 0.1.18

    - Updated environment varables to coalesce from `DATABASE_*` to `PG_*`



# VERSION 0.1.17

	- Add `transfer` script (facilitate database interactions)

	- Fix the query function in the pandas database mixin

docker-compose.test.yaml

+18 −5
Original line number Diff line number Diff line
@@ -16,11 +16,24 @@ services: 
      - postgres



  postgres:

    image: postgres:14.0

    image: code.ornl.gov:4567/eagle-i/mirror/crunchydata/crunchy-postgres:ubi8-13.10-5.1.5-0

    healthcheck:

      test: ["CMD", "/usr/pgsql-13/bin/pg_isready"]

      interval: 60s

      timeout: 10s

      retries: 20

    environment:

      - POSTGRES_PASSWORD=postgres

      - POSTGRES_USER=postgres

      - POSTGRES_DB=postgres

      - PG_DATABASE=postgres

      - PG_PRIMARY_USER=postgres

      - PG_PRIMARY_PASSWORD=postgres

      - MODE=postgres

      - PG_MODE=primary

      - PG_USER=postgres

      - PG_PASSWORD=postgres

      - PG_ROOT_PASSWORD=postgres

      - TIMEZONE=UTC

      - PG_PRIMARY_PORT=5432



    volumes:

      - ./sql/create_tables.sql:/docker-entrypoint-initdb.d/create_tables.sql

      - ./sql/fill_tables.sql:/docker-entrypoint-initdb.d/fill_tables.sql

docker-compose.yaml

+18 −5
Original line number Diff line number Diff line
@@ -13,11 +13,24 @@ services: 
      - '/dev/null'



  postgres:

    image: postgres:14.0

    image: code.ornl.gov:4567/eagle-i/mirror/crunchydata/crunchy-postgres:ubi8-13.10-5.1.5-0

    healthcheck:

      test: ["CMD", "/usr/pgsql-13/bin/pg_isready"]

      interval: 60s

      timeout: 10s

      retries: 20

    environment:

      - POSTGRES_PASSWORD=postgres

      - POSTGRES_USER=postgres

      - POSTGRES_DB=postgres

      - PG_DATABASE=postgres

      - PG_PRIMARY_USER=postgres

      - PG_PRIMARY_PASSWORD=postgres

      - MODE=postgres

      - PG_MODE=primary

      - PG_USER=postgres

      - PG_PASSWORD=postgres

      - PG_ROOT_PASSWORD=postgres

      - TIMEZONE=UTC

      - PG_PRIMARY_PORT=5432



    volumes:

      - ./sql/create_tables.sql:/docker-entrypoint-initdb.d/create_tables.sql

      - ./sql/fill_tables.sql:/docker-entrypoint-initdb.d/fill_tables.sql

docs/database.md

+7 −7
Original line number Diff line number Diff line
@@ -16,18 +16,18 @@ Provides an abstract class for connecting to a database using 
environmental variables.



Connection info stored in system environment variables:

    - DATABASE_TIMEOUT: an integer representing the seconds to wait

    - DATABASE_TIMEOUT, PG_TIMEOUT: an integer representing the seconds to wait

                        before deciding a timeout occurred.

    - DATABASE_DB: a string representing the database to connect to

    - DATABASE_USER: a string representing the user to connect to the

    - DATABASE_DB, PG_DATABASE: a string representing the database to connect to

    - DATABASE_USER, PG_USER: a string representing the user to connect to the

                     database as

    - DATABASE_PW: a string representing the password for the

    - DATABASE_PW, PG_PASSWORD: a string representing the password for the

                   DATABASE_USER

    - DATABASE_HOST: a string representing the hostname or IP address

    - DATABASE_HOST, PG_HOST: a string representing the hostname or IP address

                     hosting the database

    - DATABASE_PORT: an integer representing the port to connect to the

    - DATABASE_PORT, PG_PORT: an integer representing the port to connect to the

                     database on

    - DATABASE_SCHEMA: a string representing the schema to default to

    - DATABASE_SCHEMA, PG_SCHEMA: a string representing the schema to default to

                       when creating a database connection



**Arguments**: