diff --git a/.end.dist b/.end.dist deleted file mode 100644 index e69de29..0000000 diff --git a/.env b/.env new file mode 100644 index 0000000..828ba25 --- /dev/null +++ b/.env @@ -0,0 +1,12 @@ +#postgres + +#POSTGRES_PASSWORD=password +#POSTGRES_DB=first_db +#POSTGRES_USER=user +POSTGRES_PASSWORD=MYSQL_ROOT_PASSWORD +POSTGRES_DB=MY_DATABASE +POSTGRES_USER=MYSQL_USER + +#pgadmin +PGADMIN_DEFAULT_EMAIL=yaslonane@yandex.ru +PGADMIN_DEFAULT_PASSWORD=A1qwerty \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index e58afaa..1aa7975 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,9 +16,9 @@ services: image: postgres restart: always environment: - POSTGRES_PASSWORD: MYSQL_ROOT_PASSWORD - POSTGRES_DB: MY_DATABASE - POSTGRES_USER: MYSQL_USER + POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} + POSTGRES_DB: ${POSTGRES_DB} + POSTGRES_USER: ${POSTGRES_USER} volumes: - ./postgres/data:/var/lib/postgresql/data pgadmin: @@ -28,7 +28,7 @@ services: depends_on: - db environment: - PGADMIN_DEFAULT_EMAIL: yaslonane@yandex.ru - PGADMIN_DEFAULT_PASSWORD: A1qwerty + PGADMIN_DEFAULT_EMAIL: ${PGADMIN_DEFAULT_EMAIL} + PGADMIN_DEFAULT_PASSWORD: ${PGADMIN_DEFAULT_PASSWORD} ports: - 8080:80 diff --git a/postgres/data/base/16384/pg_internal.init b/postgres/data/base/16384/pg_internal.init index 6e0dcfe..8d74642 100644 Binary files a/postgres/data/base/16384/pg_internal.init and b/postgres/data/base/16384/pg_internal.init differ diff --git a/postgres/data/base/5/pg_internal.init b/postgres/data/base/5/pg_internal.init index 5b3eabf..9d39444 100644 Binary files a/postgres/data/base/5/pg_internal.init and b/postgres/data/base/5/pg_internal.init differ diff --git a/postgres/data/global/pg_control b/postgres/data/global/pg_control index e56f48f..40a8e09 100644 Binary files a/postgres/data/global/pg_control and b/postgres/data/global/pg_control differ diff --git a/postgres/data/global/pg_internal.init b/postgres/data/global/pg_internal.init index ead0cbe..ab3ebe0 100644 Binary files a/postgres/data/global/pg_internal.init and b/postgres/data/global/pg_internal.init differ diff --git a/postgres/data/pg_stat/pgstat.stat b/postgres/data/pg_stat/pgstat.stat index 60b8b6e..95e2aa2 100644 Binary files a/postgres/data/pg_stat/pgstat.stat and b/postgres/data/pg_stat/pgstat.stat differ diff --git a/postgres/data/pg_wal/000000010000000000000001 b/postgres/data/pg_wal/000000010000000000000001 index 8c4b385..7f54e20 100644 Binary files a/postgres/data/pg_wal/000000010000000000000001 and b/postgres/data/pg_wal/000000010000000000000001 differ