Skip to content

Commit

Permalink
PR clean up.
Browse files Browse the repository at this point in the history
  • Loading branch information
dbernstein committed Oct 24, 2024
1 parent 6e34a8c commit 023987f
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ ENV POETRY_HOME="/etc/poetry"
# required for postgres ssl: the crt file doesn't exist
# but the path must point to a visible directory otherwise we
# get a permissions error
ENV PGSSLCERT /tmp/postgresql.crt
ENV PGSSLCERT=/tmp/postgresql.crt

RUN set -x \
&& addgroup -g 101 -S nginx \
Expand Down
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ will be served from the linked package, rather than the CDN.

To install the registry locally, you'll need the following:

- PostgreSQL 12+
- PostgreSQL 16+
- PostGIS 3
- Python 3.8+ (3.9 is the build target for the Docker install)
- Appropriate system dependencies to build the Python dependencies, which may include:
Expand Down Expand Up @@ -159,6 +159,12 @@ CREATE EXTENSION postgis;
\c simplified_registry_test
CREATE EXTENSION fuzzystrmatch;
CREATE EXTENSION postgis;

\c simplified_registry_dev postgres
GRANT ALL ON SCHEMA public TO simplified;

\c simplified_registry_test postgres
GRANT ALL ON SCHEMA public TO simplified;
```

The database configuration is exposed to the application via environment variables.
Expand Down
2 changes: 2 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ services:
- "80:80"
environment:
- SIMPLIFIED_TEST_DATABASE=postgresql://simplified_test:simplified_test@libreg_local_db:5433/simplified_registry_test
# AWS RDS Postgres 16+ enables SSL by default so we require ssl here in order to mirror the production environment
# as closely as possible for our dev instance.
- SIMPLIFIED_PRODUCTION_DATABASE=postgresql://simplified:simplified@libreg_local_db:5433/simplified_registry_dev?sslmode=require
- FLASK_ENV=development
- AWS_ACCESS_KEY_ID=TEST
Expand Down
2 changes: 1 addition & 1 deletion poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ Pillow = "*"
pycryptodome = "*"
PyJWT = "*"
python = ">=3.8,<4"
pyyaml = ">=6.0.2"
requests = "2.31.0"
SQLAlchemy = "^1.4"
uszipcode = "==1.0.1"
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ docker =
allowlist_externals = poetry

[docker:db-registry]
image = postgis/postgis:12-3.1
image = postgis/postgis:16-3.5
environment =
POSTGRES_USER=simplified_test
POSTGRES_PASSWORD=test
Expand Down

0 comments on commit 023987f

Please sign in to comment.